From 597b74cb711751b300e4cc555d54c6eccc0f24ad Mon Sep 17 00:00:00 2001 From: steven-omaha <35634100+steven-omaha@users.noreply.github.com> Date: Wed, 1 Feb 2023 16:42:49 +0100 Subject: [PATCH] fix some pedantic lints --- src/backend/actual/rust.rs | 4 ++-- src/backend/backend_trait.rs | 2 +- src/core.rs | 6 +++--- src/grouping/group.rs | 8 ++++---- src/review.rs | 2 +- src/search.rs | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/backend/actual/rust.rs b/src/backend/actual/rust.rs index 3691b3e..a1170f9 100644 --- a/src/backend/actual/rust.rs +++ b/src/backend/actual/rust.rs @@ -29,7 +29,7 @@ impl Backend for Rust { let content = read_to_string(file).context("reading crates file")?; let json: Value = serde_json::from_str(&content).context("parsing JSON from crates file")?; - extract_packages(json).context("extracing packages from crates file") + extract_packages(&json).context("extracing packages from crates file") } fn get_explicitly_installed_packages(&self) -> Result> { @@ -42,7 +42,7 @@ impl Backend for Rust { } } -fn extract_packages(json: Value) -> Result> { +fn extract_packages(json: &Value) -> Result> { let result: HashSet<_> = json .get("installs") .context("get 'installs' field from json")? diff --git a/src/backend/backend_trait.rs b/src/backend/backend_trait.rs index 12feef5..97c0821 100644 --- a/src/backend/backend_trait.rs +++ b/src/backend/backend_trait.rs @@ -35,7 +35,7 @@ pub(crate) trait Backend: Debug { let section_header = format!("[{}]", self.get_section()); for (group, packages) in group_package_map { - group.save_packages(§ion_header, packages); + group.save_packages(§ion_header, &packages); } } diff --git a/src/core.rs b/src/core.rs index 3a6dc4e..6de0e61 100644 --- a/src/core.rs +++ b/src/core.rs @@ -70,7 +70,7 @@ impl Pacdef { match backend.get_missing_packages_sorted() { Ok(diff) => to_install.push((backend, diff)), - Err(error) => show_error(error, backend), + Err(error) => show_error(&error, &*backend), }; } @@ -155,7 +155,7 @@ impl Pacdef { match backend.get_unmanaged_packages_sorted() { Ok(unmanaged) => result.push((backend, unmanaged)), - Err(error) => show_error(error, backend), + Err(error) => show_error(&error, &*backend), }; } result @@ -278,7 +278,7 @@ fn get_assumed_group_file_names(arg_match: &ArgMatches) -> Result> Ok(paths) } -fn show_error(error: anyhow::Error, backend: Box) { +fn show_error(error: &anyhow::Error, backend: &dyn Backend) { let section = backend.get_section(); match get_single_var("RUST_BACKTRACE") { Some(s) => { diff --git a/src/grouping/group.rs b/src/grouping/group.rs index 89193af..4aa91fd 100644 --- a/src/grouping/group.rs +++ b/src/grouping/group.rs @@ -94,7 +94,7 @@ impl Group { sections.insert(section); } Err(e) => { - println!("WARNING: could not process a section under group '{name}': {e:?}\n") + println!("WARNING: could not process a section under group '{name}': {e:?}\n"); } } } @@ -112,13 +112,13 @@ impl Group { }) } - pub(crate) fn save_packages(&self, section_header: &str, packages: Vec) { + pub(crate) fn save_packages(&self, section_header: &str, packages: &[Package]) { let mut content = read_to_string(&self.path).unwrap(); if content.contains(section_header) { - write_packages_to_existing_section(&mut content, section_header, &packages); + write_packages_to_existing_section(&mut content, section_header, packages); } else { - add_new_section_with_packages(&mut content, section_header, &packages); + add_new_section_with_packages(&mut content, section_header, packages); } let mut file = File::create(&self.path).unwrap(); diff --git a/src/review.rs b/src/review.rs index cbc2aaf..3120522 100644 --- a/src/review.rs +++ b/src/review.rs @@ -77,7 +77,7 @@ pub(crate) fn review( } for strat in strategies { - strat.execute()? + strat.execute()?; } Ok(()) diff --git a/src/search.rs b/src/search.rs index b0caf38..3166065 100644 --- a/src/search.rs +++ b/src/search.rs @@ -21,7 +21,7 @@ pub(crate) fn search_packages(args: &ArgMatches, groups: &HashSet) -> Res for section in &group.sections { for package in §ion.packages { if re.is_match(&package.name) { - vec.push((group, section, package)) + vec.push((group, section, package)); } } }