Merge pull request #895 from cgwalters/fix-misc-warnings

ext: Fix a few lints
containers · Nov 11, 2024 · c1ac763 · c1ac763
2 parents 56e2862 + e0c627e
commit c1ac763
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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::<Result<Vec<_>>>()?;
         let remaining_layers = remaining_layers
             .into_iter()

diff --git 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<Self> {