Using prior builds for improving encapsulation

Cargo.toml

@@ -45,12 +45,12 @@ anyhow = "1.0.69"
 binread = "2.2.0"
 bitflags = "2.3"
 camino = "1.1.1"
-cap-std-ext = "1.0"
+cap-std-ext = "2.0"
 cap-std = { version = "1.0.3", features = ["fs_utf8"] }
 containers-image-proxy = "0.5.1"
 # Explicitly force on libc
-rustix = { version = "0.36", features = ["use-libc"] }
-cap-primitives = "1.0.15"
+rustix = { version = "0.37", features = ["use-libc"] }
+cap-primitives = "1.0.3"
 cap-tempfile = "1.0.1"
 chrono = { version = "0.4.23", features = ["serde"] }
 clap = { version = "4.3", features = ["derive"] }
@@ -72,7 +72,7 @@ nix = "0.26.1"
 openssl = "0.10.49"
 once_cell = "1.16.0"
 os-release = "0.1.0"
-ostree-ext = "0.10.0"
+ostree-ext = "0.11.0"
 paste = "1.0"
 phf = { version = "0.11", features = ["macros"] }
 rand = "0.8.5"

rpmostree-cxxrs.cxx

@@ -3226,6 +3226,15 @@ extern "C"
     return (self.*buildtime$) ();
   }
 
+  void
+  rpmostreecxx$cxxbridge1$PackageMeta$changelogs (const ::rpmostreecxx::PackageMeta &self,
+                                                  ::rust::Vec< ::std::uint64_t> *return$) noexcept
+  {
+    ::rust::Vec< ::std::uint64_t> (::rpmostreecxx::PackageMeta::*changelogs$) () const
+        = &::rpmostreecxx::PackageMeta::changelogs;
+    new (return$)::rust::Vec< ::std::uint64_t> ((self.*changelogs$) ());
+  }
+
   const ::std::string *
   rpmostreecxx$cxxbridge1$PackageMeta$src_pkg (const ::rpmostreecxx::PackageMeta &self) noexcept
   {

rust/src/builtins/apply_live.rs

@@ -36,7 +36,7 @@ fn get_args_variant(sysroot: &ostree::Sysroot, opts: &Opts) -> Result<glib::Vari
     } else if opts.reset {
         let booted = sysroot.require_booted_deployment()?;
         // Unwrap safety: This can't return NULL
-        let csum = booted.csum().expect("csum");
+        let csum = booted.csum();
         r.insert(live::OPT_TARGET, &csum.as_str());
     }
 
@@ -76,9 +76,9 @@ pub(crate) fn applylive_finish(sysroot: &crate::ffi::OstreeSysroot) -> CxxResult
     let sysroot = sysroot.glib_reborrow();
     let cancellable = gio::Cancellable::NONE;
     sysroot.load_if_changed(cancellable)?;
-    let repo = &sysroot.repo().unwrap();
+    let repo = &sysroot.repo();
     let booted = &sysroot.require_booted_deployment()?;
-    let booted_commit = booted.csum().expect("csum");
+    let booted_commit = booted.csum();
     let booted_commit = booted_commit.as_str();
 
     let live_state = live::get_live_state(repo, booted)?

rust/src/builtins/compose/mod.rs

@@ -9,9 +9,8 @@ use anyhow::{Context, Result};
 use cap_std::fs::{Dir, DirBuilder, Permissions};
 use cap_std_ext::cap_std;
 use cap_std_ext::dirext::CapStdExtDirExt;
-use cap_std_ext::rustix;
-use cap_std_ext::rustix::fd::AsFd;
 use fn_error_context::context;
+use rustix::fd::AsFd;
 use rustix::fs::{FileType, MetadataExt};
 use std::io::Read;
 use std::os::unix::fs::DirBuilderExt;

rust/src/bwrap.rs

@@ -8,7 +8,6 @@ use crate::normalization;
 use anyhow::{Context, Result};
 use cap_std::fs::Dir;
 use cap_std_ext::prelude::{CapStdExtCommandExt, CapStdExtDirExt};
-use cap_std_ext::rustix;
 use fn_error_context::context;
 use ostree_ext::{gio, glib};
 use std::num::NonZeroUsize;