diff options
author | Ben S <ogham@bsago.me> | 2015-08-26 12:19:23 +0100 |
---|---|---|
committer | Ben S <ogham@bsago.me> | 2015-08-26 12:19:23 +0100 |
commit | 5f48bfd8b4079d5fa213d3397dabd2a388bf325e (patch) | |
tree | 4a34b5f6e9a03b35bd84d7965cee8975c4c0c2db /src/dir.rs | |
parent | 5e1ff9cdcd1c6792b6dd3374ab6dc50e0bf5f669 (diff) |
Propagate errors that occur during readdir
Fixes #71 - the I/O error should now be displayed as an error, rather than as a panic.
Also, fix some comments.
Diffstat (limited to 'src/dir.rs')
-rw-r--r-- | src/dir.rs | 17 |
1 files changed, 9 insertions, 8 deletions
@@ -23,20 +23,21 @@ impl Dir { /// Create a new Dir object filled with all the files in the directory /// pointed to by the given path. Fails if the directory can't be read, or - /// isn't actually a directory. + /// isn't actually a directory, or if there's an IO error that occurs + /// while scanning. pub fn readdir(path: &Path, git: bool) -> io::Result<Dir> { - fs::read_dir(path).map(|dir_obj| Dir { - contents: dir_obj.map(|entry| entry.unwrap().path()).collect(), + let reader = try!(fs::read_dir(path)); + let contents = try!(reader.map(|e| e.map(|e| e.path())).collect()); + + Ok(Dir { + contents: contents, path: path.to_path_buf(), git: if git { Git::scan(path).ok() } else { None }, }) } - /// Produce a vector of File objects from an initialised directory, - /// printing out an error if any of the Files fail to be created. - /// - /// Passing in `recurse` means that any directories will be scanned for - /// their contents, as well. + /// Produce an iterator of IO results of trying to read all the files in + /// this directory. pub fn files<'dir>(&'dir self) -> Files<'dir> { Files { inner: self.contents.iter(), |