Llewellyn/exa
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/exa.git synced 2024-11-30 07:33:53 +00:00
Code Issues Projects Releases Wiki Activity

Extract common classify

Browse Source
This commit is contained in:
Benjamin Sago 2017-06-24 22:53:34 +01:00
parent aea0035f94
commit ed3d28f2cd
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/options/view.rs
View File

@ -34,6 +34,8 @@ impl View {
pub fn deduce(matches: &getopts::Matches, filter: FileFilter, dir_action: DirAction) -> Result<View, Misfire> { pub fn deduce(matches: &getopts::Matches, filter: FileFilter, dir_action: DirAction) -> Result<View, Misfire> {
use options::misfire::Misfire::*; use options::misfire::Misfire::*;
let classify = Classify::deduce(matches);
let colour_scale = || { let colour_scale = || {
matches.opt_present("color-scale") || matches.opt_present("colour-scale") matches.opt_present("color-scale") || matches.opt_present("colour-scale")
}; };
@ -68,8 +70,6 @@ impl View {
xattr: xattr::ENABLED && matches.opt_present("extended"), xattr: xattr::ENABLED && matches.opt_present("extended"),
}; };
let classify = Classify::deduce(matches);
Ok(View { mode: Mode::Details(details), colours, classify }) Ok(View { mode: Mode::Details(details), colours, classify })
} }
}; };
@ -96,7 +96,6 @@ impl View {
}; };
let other_options_scan = || { let other_options_scan = || {
let classify = Classify::deduce(matches);
let term_colours = TerminalColours::deduce(matches)?; let term_colours = TerminalColours::deduce(matches)?;
let term_width = TerminalWidth::deduce()?; let term_width = TerminalWidth::deduce()?;