diff options
Diffstat (limited to 'src/options')
| -rw-r--r-- | src/options/dir_action.rs | 4 | ||||
| -rw-r--r-- | src/options/filter.rs | 6 | ||||
| -rw-r--r-- | src/options/mod.rs | 8 | ||||
| -rw-r--r-- | src/options/view.rs | 16 |
4 files changed, 17 insertions, 17 deletions
diff --git a/src/options/dir_action.rs b/src/options/dir_action.rs index 1f3c06b..d6fa993 100644 --- a/src/options/dir_action.rs +++ b/src/options/dir_action.rs @@ -36,8 +36,8 @@ impl DirAction { (true, true, _ ) => Err(Misfire::Conflict("recurse", "list-dirs")), (_, true, true ) => Err(Misfire::Conflict("tree", "list-dirs")), - (_ , _, true ) => Ok(DirAction::Recurse(try!(RecurseOptions::deduce(matches, true)))), - (true, false, false) => Ok(DirAction::Recurse(try!(RecurseOptions::deduce(matches, false)))), + (_ , _, true ) => Ok(DirAction::Recurse(RecurseOptions::deduce(matches, true)?)), + (true, false, false) => Ok(DirAction::Recurse(RecurseOptions::deduce(matches, false)?)), (false, true, _ ) => Ok(DirAction::AsFile), (false, false, _ ) => Ok(DirAction::List), } diff --git a/src/options/filter.rs b/src/options/filter.rs index ce7d4ba..b28f56d 100644 --- a/src/options/filter.rs +++ b/src/options/filter.rs @@ -75,9 +75,9 @@ impl FileFilter { Ok(FileFilter { list_dirs_first: matches.opt_present("group-directories-first"), reverse: matches.opt_present("reverse"), - sort_field: try!(SortField::deduce(matches)), + sort_field: SortField::deduce(matches)?, show_invisibles: matches.opt_present("all"), - ignore_patterns: try!(IgnorePatterns::deduce(matches)), + ignore_patterns: IgnorePatterns::deduce(matches)?, }) } @@ -265,7 +265,7 @@ impl IgnorePatterns { }; Ok(IgnorePatterns { - patterns: try!(patterns), + patterns: patterns?, }) } diff --git a/src/options/mod.rs b/src/options/mod.rs index f5c8c74..b666503 100644 --- a/src/options/mod.rs +++ b/src/options/mod.rs @@ -120,7 +120,7 @@ impl Options { return Err(Misfire::Version); } - let options = try!(Options::deduce(&matches)); + let options = Options::deduce(&matches)?; Ok((options, matches.free)) } @@ -138,9 +138,9 @@ impl Options { /// Determines the complete set of options based on the given command-line /// arguments, after they’ve been parsed. fn deduce(matches: &getopts::Matches) -> Result<Options, Misfire> { - let dir_action = try!(DirAction::deduce(&matches)); - let filter = try!(FileFilter::deduce(&matches)); - let view = try!(View::deduce(&matches, filter.clone(), dir_action)); + let dir_action = DirAction::deduce(&matches)?; + let filter = FileFilter::deduce(&matches)?; + let view = View::deduce(&matches, filter.clone(), dir_action)?; Ok(Options { dir_action: dir_action, diff --git a/src/options/view.rs b/src/options/view.rs index 69cbca4..06f76ba 100644 --- a/src/options/view.rs +++ b/src/options/view.rs @@ -37,7 +37,7 @@ impl View { Err(Useless("oneline", true, "long")) } else { - let term_colours = try!(TerminalColours::deduce(matches)); + let term_colours = TerminalColours::deduce(matches)?; let colours = match term_colours { TerminalColours::Always => Colours::colourful(colour_scale()), TerminalColours::Never => Colours::plain(), @@ -52,7 +52,7 @@ impl View { }; let details = Details { - columns: Some(try!(Columns::deduce(matches))), + columns: Some(Columns::deduce(matches)?), header: matches.opt_present("header"), recurse: dir_action.recurse_options(), filter: filter.clone(), @@ -86,8 +86,8 @@ impl View { }; let other_options_scan = || { - let term_colours = try!(TerminalColours::deduce(matches)); - let term_width = try!(TerminalWidth::deduce()); + let term_colours = TerminalColours::deduce(matches)?; + let term_width = TerminalWidth::deduce()?; if let Some(&width) = term_width.as_ref() { let colours = match term_colours { @@ -164,7 +164,7 @@ impl View { }; if matches.opt_present("long") { - let long_options = try!(long()); + let long_options = long()?; if matches.opt_present("grid") { match other_options_scan() { @@ -178,7 +178,7 @@ impl View { } } - try!(long_options_scan()); + long_options_scan()?; other_options_scan() } @@ -232,8 +232,8 @@ impl TerminalWidth { impl Columns { fn deduce(matches: &getopts::Matches) -> Result<Columns, Misfire> { Ok(Columns { - size_format: try!(SizeFormat::deduce(matches)), - time_types: try!(TimeTypes::deduce(matches)), + size_format: SizeFormat::deduce(matches)?, + time_types: TimeTypes::deduce(matches)?, inode: matches.opt_present("inode"), links: matches.opt_present("links"), blocks: matches.opt_present("blocks"), |