From 3e72cd2998bc24ac0dd2f9feb9039209d4036ca9 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Thu, 7 Oct 2021 13:54:55 -0500 Subject: [PATCH] style: Make clippy happy --- crates/tree/examples/failures.rs | 4 ++-- src/function.rs | 4 ++-- src/path/fc.rs | 1 + src/str/adapters.rs | 1 + 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/crates/tree/examples/failures.rs b/crates/tree/examples/failures.rs index 42c6ce6..9ba640c 100644 --- a/crates/tree/examples/failures.rs +++ b/crates/tree/examples/failures.rs @@ -12,7 +12,7 @@ fn main() { let expected = [1, 2, 3]; let actual = 15; - let pred = predicates::iter::in_iter(expected); + let pred = predicates::iter::in_iter(IntoIterator::into_iter(expected)); if let Some(case) = pred.find_case(false, &actual) { let tree = case.tree(); println!("{}", tree); @@ -41,7 +41,7 @@ Moon! Goodbye!"; let pred = predicates::str::diff(expected); - if let Some(case) = pred.find_case(false, &actual) { + if let Some(case) = pred.find_case(false, actual) { let tree = case.tree(); println!("{}", tree); } diff --git a/src/function.rs b/src/function.rs index fb0323f..b7ca667 100644 --- a/src/function.rs +++ b/src/function.rs @@ -137,6 +137,6 @@ where #[test] fn str_function() { let f = function(|x: &str| x == "hello"); - assert!(f.eval(&"hello")); - assert!(!f.eval(&"goodbye")); + assert!(f.eval("hello")); + assert!(!f.eval("goodbye")); } diff --git a/src/path/fc.rs b/src/path/fc.rs index dbef015..9317168 100644 --- a/src/path/fc.rs +++ b/src/path/fc.rs @@ -106,6 +106,7 @@ where /// assert_eq!(true, predicate_fn.eval(Path::new("./tests/hello_world"))); /// assert_eq!(false, predicate_fn.eval(Path::new("./tests/empty_file"))); /// ``` + #[allow(clippy::wrong_self_convention)] fn from_file_path(self) -> FileContentPredicate { FileContentPredicate { p: self } } diff --git a/src/str/adapters.rs b/src/str/adapters.rs index f295410..b6f4d51 100644 --- a/src/str/adapters.rs +++ b/src/str/adapters.rs @@ -175,6 +175,7 @@ where /// let variable: &[u8] = b""; /// assert_eq!(false, predicate_fn.eval(variable)); /// ``` + #[allow(clippy::wrong_self_convention)] fn from_utf8(self) -> Utf8Predicate { Utf8Predicate { p: self } }