Llewellyn/exa
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/exa.git synced 2024-12-29 02:53:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #380 from kornelski/master

Browse Source 
Replaced try!() with ?
This commit is contained in:
Benjamin Sago 2018-05-28 10:50:06 +02:00 committed by GitHub
commit 55048f7ee2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/fs/dir.rs
View File

@ -35,9 +35,9 @@ impl Dir {
pub fn read_dir(path: PathBuf) -> IOResult<Dir> { pub fn read_dir(path: PathBuf) -> IOResult<Dir> {
info!("Reading directory {:?}", &path); info!("Reading directory {:?}", &path);
let contents: Vec<PathBuf> = try!(fs::read_dir(&path)? let contents = fs::read_dir(&path)?
.map(|result| result.map(|entry| entry.path())) .map(|result| result.map(|entry| entry.path()))
.collect()); .collect::<Result<_,_>>()?;
Ok(Dir { contents, path }) Ok(Dir { contents, path })
} }

10
src/options/help.rs
View File

@ -96,20 +96,20 @@ impl fmt::Display for HelpString {
/// Format this help options into an actual string of help /// Format this help options into an actual string of help
/// text to be displayed to the user. /// text to be displayed to the user.
fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> { fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
try!(write!(f, "Usage:\n exa [options] [files...]\n")); write!(f, "Usage:\n exa [options] [files...]\n")?;
if !self.only_long { if !self.only_long {
try!(write!(f, "{}", OPTIONS)); write!(f, "{}", OPTIONS)?;
} }
try!(write!(f, "{}", LONG_OPTIONS)); write!(f, "{}", LONG_OPTIONS)?;
if self.git { if self.git {
try!(write!(f, "\n{}", GIT_HELP)); write!(f, "\n{}", GIT_HELP)?;
} }
if self.xattrs { if self.xattrs {
try!(write!(f, "\n{}", EXTENDED_HELP)); write!(f, "\n{}", EXTENDED_HELP)?;
} }
Ok(()) Ok(())