From dd6718bd3b24a037608cd595b3f15cd883563260 Mon Sep 17 00:00:00 2001 From: Fabricio Dematte Date: Thu, 10 Jun 2021 13:01:45 -0300 Subject: [PATCH] chore: remove comments --- src/cli.rs | 49 ++++++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/src/cli.rs b/src/cli.rs index 3a5d483..0b38cab 100644 --- a/src/cli.rs +++ b/src/cli.rs @@ -37,8 +37,8 @@ pub fn parse_args() -> crate::Result { match &mut parsed_args.command { Command::Compress { files, .. } | Command::Decompress { files, .. } => { *files = canonicalize_files(&files)?; - }, - _ => {}, + } + _ => {} } Ok(parsed_args) } @@ -72,7 +72,7 @@ fn canonicalize(path: impl AsRef) -> crate::Result { } else { Err(io_err.into()) } - }, + } } } @@ -107,7 +107,7 @@ pub fn parse_args_from(mut args: Vec) -> crate::Result { let command = Command::Compress { files, compressed_output_path }; ParsedArgs { command, flags } - }, + } // Defaults to decompression when there is no subcommand None => { flags_info.push(arg_flag!('o', "output")); @@ -130,7 +130,7 @@ pub fn parse_args_from(mut args: Vec) -> crate::Result { let command = Command::Decompress { files, output_folder }; ParsedArgs { command, flags } - }, + } _ => unreachable!("You should match each subcommand passed."), }; @@ -157,14 +157,20 @@ mod tests { assert_eq!(test_cli("--help").unwrap().command, Command::ShowHelp); assert_eq!(test_cli("--version").unwrap().command, Command::ShowVersion); assert_eq!(test_cli("--version").unwrap().flags, oof::Flags::default()); - assert_eq!(test_cli("foo.zip bar.zip").unwrap().command, Command::Decompress { - files: vec!["foo.zip".into(), "bar.zip".into()], - output_folder: None - }); - assert_eq!(test_cli("compress foo bar baz.zip").unwrap().command, Command::Compress { - files: vec!["foo".into(), "bar".into()], - compressed_output_path: "baz.zip".into() - }); + assert_eq!( + test_cli("foo.zip bar.zip").unwrap().command, + Command::Decompress { + files: vec!["foo.zip".into(), "bar.zip".into()], + output_folder: None + } + ); + assert_eq!( + test_cli("compress foo bar baz.zip").unwrap().command, + Command::Compress { + files: vec!["foo".into(), "bar".into()], + compressed_output_path: "baz.zip".into() + } + ); assert_eq!(test_cli("compress").unwrap_err(), crate::Error::MissingArgumentsForCompression); } @@ -174,15 +180,12 @@ mod tests { assert_eq!(test_cli("--help").unwrap().flags, oof::Flags::default()); assert_eq!(test_cli("--version").unwrap().flags, oof::Flags::default()); - // Just for reference: - // pub struct Flags { - // pub boolean_flags: BTreeSet<&'static str>, - // pub argument_flags: BTreeMap<&'static str, OsString>, - // } - - assert_eq!(test_cli("foo --yes bar --output folder").unwrap().flags, oof::Flags { - boolean_flags: vec!["yes"].into_iter().collect(), - argument_flags: vec![("output", OsString::from("folder"))].into_iter().collect(), - }); + assert_eq!( + test_cli("foo --yes bar --output folder").unwrap().flags, + oof::Flags { + boolean_flags: vec!["yes"].into_iter().collect(), + argument_flags: vec![("output", OsString::from("folder"))].into_iter().collect(), + } + ); } }