From da7a67097dafacad86464fe8f2acc6c0c497c66f Mon Sep 17 00:00:00 2001 From: Saeed Rasooli Date: Mon, 1 Mar 2021 05:29:28 +0330 Subject: [PATCH 1/2] fix lint error clippy::unnecessary-wraps on process_dir --- src/find/mod.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/find/mod.rs b/src/find/mod.rs index f7d94a9..294c278 100644 --- a/src/find/mod.rs +++ b/src/find/mod.rs @@ -109,7 +109,7 @@ fn process_dir<'a>( config: &Config, deps: &'a dyn Dependencies<'a>, matcher: &Box, -) -> Result> { +) -> u64 { let mut found_count: u64 = 0; let mut walkdir = WalkDir::new(dir) .contents_first(config.depth_first) @@ -137,7 +137,7 @@ fn process_dir<'a>( } } } - Ok(found_count) + found_count } fn do_find<'a>(args: &[&str], deps: &'a dyn Dependencies<'a>) -> Result> { @@ -153,7 +153,7 @@ fn do_find<'a>(args: &[&str], deps: &'a dyn Dependencies<'a>) -> Result Date: Mon, 1 Mar 2021 06:05:34 +0330 Subject: [PATCH 2/2] fix ignored clippy::borrowed_box error on process_dir --- src/find/mod.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/find/mod.rs b/src/find/mod.rs index 294c278..911b3b0 100644 --- a/src/find/mod.rs +++ b/src/find/mod.rs @@ -103,12 +103,11 @@ fn parse_args(args: &[&str]) -> Result> { }) } -#[allow(clippy::borrowed_box)] // FIXME? fn process_dir<'a>( dir: &str, config: &Config, deps: &'a dyn Dependencies<'a>, - matcher: &Box, + matcher: &dyn matchers::Matcher, ) -> u64 { let mut found_count: u64 = 0; let mut walkdir = WalkDir::new(dir) @@ -152,7 +151,7 @@ fn do_find<'a>(args: &[&str], deps: &'a dyn Dependencies<'a>) -> Result