From e0c627e3f4ee50ffd75ad84403ca86053148c678 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 11 Nov 2024 16:53:23 +0000 Subject: [PATCH] ext: Fix a few lints - Wire up to workspace lint standards - Fix a few remaining clippy lints Signed-off-by: Colin Walters --- ostree-ext/Cargo.toml | 3 +++ ostree-ext/src/container/store.rs | 2 +- ostree-ext/src/fixture.rs | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ostree-ext/Cargo.toml b/ostree-ext/Cargo.toml index 2d1d400dd..290b42228 100644 --- a/ostree-ext/Cargo.toml +++ b/ostree-ext/Cargo.toml @@ -69,3 +69,6 @@ features = ["dox"] docgen = ["clap_mangen"] dox = ["ostree/dox"] internal-testing-api = ["xshell", "indoc", "similar-asserts"] + +[lints] +workspace = true diff --git a/ostree-ext/src/container/store.rs b/ostree-ext/src/container/store.rs index 2d9efafd8..3938199c6 100644 --- a/ostree-ext/src/container/store.rs +++ b/ostree-ext/src/container/store.rs @@ -617,7 +617,7 @@ impl ImageImporter { let commit_layer = commit_layer.map(query).transpose()?; let component_layers = component_layers .into_iter() - .map(|l| query(l)) + .map(query) .collect::>>()?; let remaining_layers = remaining_layers .into_iter() diff --git a/ostree-ext/src/fixture.rs b/ostree-ext/src/fixture.rs index 790b54a53..9231a2730 100644 --- a/ostree-ext/src/fixture.rs +++ b/ostree-ext/src/fixture.rs @@ -906,7 +906,7 @@ pub struct NonOstreeFixture { } impl NonOstreeFixture { - const SRCOCI: &str = "src/oci"; + const SRCOCI: &'static str = "src/oci"; #[context("Initializing fixture")] pub fn new_base() -> Result {