Llewellyn/exa
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/exa.git synced 2024-09-28 05:09:01 +00:00
Code Issues Projects Releases Wiki Activity

Inline this thing

Browse Source 
If a function returns one of several enum variants, but we’re only interested in one, then just return its contents and have it apply the Mode “wrapper” later.
This commit is contained in:
Benjamin Sago 2017-06-26 08:38:56 +01:00
parent 65d94636d7
commit 4be0a36d4e
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/options/view.rs
View File

@ -53,13 +53,11 @@ impl Mode {
Err(Useless("oneline", true, "long"))
}
else {
let details = details::Options {
Ok(details::Options {
columns: Some(Columns::deduce(matches)?),
header: matches.opt_present("header"),
xattr: xattr::ENABLED && matches.opt_present("extended"),
};
Ok(Mode::Details(details))
})
}
};
@ -133,21 +131,15 @@ impl Mode {
};
if matches.opt_present("long") {
let view = long()?;
let details = long()?;
if matches.opt_present("grid") {
if let Mode::Details(details) = view {
let others = other_options_scan()?;
match others {
Mode::Grid(grid) => return Ok(Mode::GridDetails(grid, details)),
_ => return Ok(others),
};
}
else {
unreachable!()
}
match other_options_scan()? {
Mode::Grid(grid) => return Ok(Mode::GridDetails(grid, details)),
others => return Ok(others),
};
}
else {
return Ok(view);
return Ok(Mode::Details(details));
}
}