From 558a9c3282f1b9c0e0d4eed0d24dbd5fd9c27418 Mon Sep 17 00:00:00 2001 From: trivernis Date: Wed, 25 Jan 2023 21:45:14 +0100 Subject: [PATCH] Run clippy --- src/error.rs | 4 ++-- src/mapper/mapped_dir.rs | 2 +- src/repository/mod.rs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/error.rs b/src/error.rs index 746d1aa..0b9edf8 100644 --- a/src/error.rs +++ b/src/error.rs @@ -23,7 +23,7 @@ impl VersionError { let mut pos = (0, src.len()).into(); let clean_src = src.trim_start_matches('^'); - if let Some((arg_str, arg_pos)) = find_in_args(&clean_src) { + if let Some((arg_str, arg_pos)) = find_in_args(clean_src) { pos = arg_pos; src = arg_str; } @@ -183,6 +183,6 @@ pub fn find_in_args(query: &str) -> Option<(String, SourceSpan)> { let args_string = std::env::args().fold(String::new(), |s, acc| format!("{s} {acc}")); args_string - .find(&query) + .find(query) .map(|index| (args_string, (index, query.len()).into())) } diff --git a/src/mapper/mapped_dir.rs b/src/mapper/mapped_dir.rs index ae02dbb..425fa6a 100644 --- a/src/mapper/mapped_dir.rs +++ b/src/mapper/mapped_dir.rs @@ -73,7 +73,7 @@ pub async fn map_direct(paths: Vec) -> Result<()> { .await; results .into_iter() - .fold(Result::Ok(()), |acc, res| acc.and_then(|_| res))?; + .fold(Result::Ok(()), |acc, res| acc.and(res))?; Ok(()) } diff --git a/src/repository/mod.rs b/src/repository/mod.rs index f1d6def..97e99db 100644 --- a/src/repository/mod.rs +++ b/src/repository/mod.rs @@ -138,7 +138,7 @@ impl Repository { })) .await .into_iter() - .fold(Result::Ok(()), |acc, res| acc.and_then(|_| res)) + .fold(Result::Ok(()), |acc, res| acc.and(res)) .into_diagnostic() .wrap_err("Failed to create application directory")?; @@ -167,7 +167,7 @@ impl Repository { self.installed_versions .all() .into_iter() - .map(|v| v.clone().into()) + .map(|v| (*v).into()) .collect() }