chore(deps): revert ocidir to 0.4.0, fix deprecations in ostree-ext

Signed-off-by: Robert Sturla <robertsturla@outlook.com>

Author: p5

Cargo.lock

@@ -34,7 +34,7 @@ indicatif = { workspace = true }
 libc = { workspace = true }
 libsystemd = "0.7.2"
 openssl = { workspace = true }
-ocidir = "0.5.0"
+ocidir = "0.4.0"
 pin-project = "1.1"
 regex = "1.11.1"
 rustix = { workspace = true, features = ["fs", "process"] }

crates/ostree-ext/Cargo.toml

@@ -340,13 +340,13 @@ fn ensure_parent_dirs(
         .map_err(Into::into)
 }
 
-fn relative_path_components(p: &Utf8Path) -> impl Iterator<Item = Utf8Component> {
+fn relative_path_components(p: &Utf8Path) -> impl Iterator<Item = Utf8Component<'_>> {
     p.components()
         .filter(|p| matches!(p, Utf8Component::Normal(_)))
 }
 
 /// Walk over the whole filesystem, and generate mappings from content object checksums
-/// to the package that owns them.  
+/// to the package that owns them.
 ///
 /// In the future, we could compute this much more efficiently by walking that
 /// instead.  But this design is currently oriented towards accepting a single ostree

crates/ostree-ext/src/fixture.rs

@@ -156,7 +156,7 @@ pub(crate) async fn create_fixture() -> Result<()> {
     let fixture = crate::fixture::Fixture::new_v1()?;
     let imgref = fixture.export_container().await?.0;
     println!("Wrote: {:?}", imgref);
-    let path = fixture.into_tempdir().into_path();
+    let path = fixture.into_tempdir().keep();
     println!("Wrote: {:?}", path);
     Ok(())
 }