Llewellyn/exa
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/exa.git synced 2024-11-26 22:06:26 +00:00
Code Issues Projects Releases Wiki Activity

Mandate --recurse with --tree

Browse Source 
Fixes #7.
This commit is contained in:
Ben S 2015-02-21 23:43:40 +00:00
parent 363d52dbb0
commit f8768e7c01
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/options.rs
View File

@ -371,6 +371,7 @@ impl DirAction {
let tree = matches.opt_present("tree"); let tree = matches.opt_present("tree");
match (recurse, list, tree) { match (recurse, list, tree) {
(false, _, true ) => Err(Misfire::Useless("tree", false, "recurse")),
(true, true, _ ) => Err(Misfire::Conflict("recurse", "list-dirs")), (true, true, _ ) => Err(Misfire::Conflict("recurse", "list-dirs")),
(true, false, false) => Ok(DirAction::Recurse), (true, false, false) => Ok(DirAction::Recurse),
(true, false, true ) => Ok(DirAction::Tree), (true, false, true ) => Ok(DirAction::Tree),
@ -543,4 +544,11 @@ mod test {
let opts = Options::getopts(&[ "--blocks".to_string() ]); let opts = Options::getopts(&[ "--blocks".to_string() ]);
assert_eq!(opts.unwrap_err(), Misfire::Useless("blocks", false, "long")) assert_eq!(opts.unwrap_err(), Misfire::Useless("blocks", false, "long"))
} }
#[test]
fn tree_without_recurse() {
let opts = Options::getopts(&[ "--tree".to_string() ]);
assert_eq!(opts.unwrap_err(), Misfire::Useless("tree", false, "recurse"))
}
} }