diff options
author | flip1995 <hello@philkrones.com> | 2019-08-27 10:51:55 +0200 |
---|---|---|
committer | Matthias Beyer <mail@beyermatthias.de> | 2019-08-28 18:18:40 +0200 |
commit | bde29b7242e045bf02e8f09dc63b54b4fc268d49 (patch) | |
tree | 9059b2be4b9d67d13db07c5896ec15b6eaa7d6b7 /lib/etc | |
parent | cb9068d7fbd3e83548fe1a59e8a760d26250aef1 (diff) |
[Auto] lib/etc/interaction: Fix Clippy warnings
Signed-off-by: flip1995 <hello@philkrones.com>
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Diffstat (limited to 'lib/etc')
-rw-r--r-- | lib/etc/libimaginteraction/src/ask.rs | 20 | ||||
-rw-r--r-- | lib/etc/libimaginteraction/src/ui.rs | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/lib/etc/libimaginteraction/src/ask.rs b/lib/etc/libimaginteraction/src/ask.rs index 603374aa..6b7b02c9 100644 --- a/lib/etc/libimaginteraction/src/ask.rs +++ b/lib/etc/libimaginteraction/src/ask.rs @@ -111,7 +111,7 @@ mod test { let answers = "n"; let mut sink: Vec<u8> = vec![]; - assert!(false == ask_bool_(question, default, &mut BufReader::new(answers.as_bytes()), &mut sink).unwrap()); + assert!(!ask_bool_(question, default, &mut BufReader::new(answers.as_bytes()), &mut sink).unwrap()); } #[test] @@ -121,7 +121,7 @@ mod test { let answers = "n\n"; let mut sink: Vec<u8> = vec![]; - assert!(false == ask_bool_(question, default, &mut BufReader::new(answers.as_bytes()), &mut sink).unwrap()); + assert!(!ask_bool_(question, default, &mut BufReader::new(answers.as_bytes()), &mut sink).unwrap()); } #[test] @@ -131,7 +131,7 @@ mod test { let answers = "n"; let mut sink: Vec<u8> = vec![]; - assert!(false == ask_bool_(question, default, &mut BufReader::new(answers.as_bytes()), &mut sink).unwrap()); + assert!(!ask_bool_(question, default, &mut BufReader::new(answers.as_bytes()), &mut sink).unwrap()); } #[test] @@ -141,7 +141,7 @@ mod test { let answers = "n\n"; let mut sink: Vec<u8> = vec![]; - assert!(false == ask_bool_(question, default, &mut BufReader::new(answers.as_bytes()), &mut sink).unwrap()); + assert!(!ask_bool_(question, default, &mut BufReader::new(answers.as_bytes()), &mut sink).unwrap()); } #[test] @@ -151,7 +151,7 @@ mod test { let answers = "y"; let mut sink: Vec<u8> = vec![]; - assert!(true == ask_bool_(question, default, &mut BufReader::new(answers.as_bytes()), &mut sink).unwrap()); + assert!(ask_bool_(question, default, &mut BufReader::new(answers.as_bytes()), &mut sink).unwrap()); } #[test] @@ -161,7 +161,7 @@ mod test { let answers = "y\n"; let mut sink: Vec<u8> = vec![]; - assert!(true == ask_bool_(question, default, &mut BufReader::new(answers.as_bytes()), &mut sink).unwrap()); + assert!(ask_bool_(question, default, &mut BufReader::new(answers.as_bytes()), &mut sink).unwrap()); } #[test] @@ -171,7 +171,7 @@ mod test { let answers = "n"; let mut sink: Vec<u8> = vec![]; - assert!(false == ask_bool_(question, default, &mut BufReader::new(answers.as_bytes()), &mut sink).unwrap()); + assert!(!ask_bool_(question, default, &mut BufReader::new(answers.as_bytes()), &mut sink).unwrap()); } #[test] @@ -181,7 +181,7 @@ mod test { let answers = "y"; let mut sink: Vec<u8> = vec![]; - assert!(true == ask_bool_(question, default, &mut BufReader::new(answers.as_bytes()), &mut sink).unwrap()); + assert!(ask_bool_(question, default, &mut BufReader::new(answers.as_bytes()), &mut sink).unwrap()); } #[test] @@ -191,7 +191,7 @@ mod test { let answers = "\n"; let mut sink: Vec<u8> = vec![]; - assert!(false == ask_bool_(question, default, &mut BufReader::new(answers.as_bytes()), &mut sink).unwrap()); + assert!(!ask_bool_(question, default, &mut BufReader::new(answers.as_bytes()), &mut sink).unwrap()); } #[test] @@ -201,7 +201,7 @@ mod test { let answers = "\n"; let mut sink: Vec<u8> = vec![]; - assert!(true == ask_bool_(question, default, &mut BufReader::new(answers.as_bytes()), &mut sink).unwrap()); + assert!(ask_bool_(question, default, &mut BufReader::new(answers.as_bytes()), &mut sink).unwrap()); } } diff --git a/lib/etc/libimaginteraction/src/ui.rs b/lib/etc/libimaginteraction/src/ui.rs index 0ad099a7..91d9f4e7 100644 --- a/lib/etc/libimaginteraction/src/ui.rs +++ b/lib/etc/libimaginteraction/src/ui.rs @@ -52,7 +52,7 @@ pub fn get_id(matches: &ArgMatches) -> Result<Vec<StoreId>> { .values_of(id_argument_name()) .ok_or(err_msg("CLI error")) .and_then(|vals| { - vals.into_iter() + vals .fold(Ok(vec![]), |acc, elem| { acc.and_then(|mut v| { let elem = StoreId::new(PathBuf::from(String::from(elem)))?; |