chore: upgrade edition → 2024, dep updates

fix: changes needed for nom v8
fix: changes needed for rkyv upgrade
fix: changes for reqwest updates
fix: changes for update to `rng`
fix: changes for update to `cacache`
fix: changes for update to `petgraph`
fix: unused demotiontarget struct
fix: `PanicHook` → `PanicHookInfo`
chore: update nom → v8
chore: update rkyv → `0.8.x`
chore: update reqwest → `0.12.x`
chore: update cacache → `13.1.x`
chore: update edition → `2024`
chore: update rust toolchain → `1.85`
chore: update all deps without breakages
chore: relock deps
chore: run `cargo update`

Signed-off-by: Sam Gammon <[email protected]>

Author: sgammon

Cargo.lock

@@ -49,7 +49,7 @@ is_ci = { workspace = true }
 is-terminal = { workspace = true }
 kdl = { workspace = true }
 miette = { workspace = true, features = ["fancy"] }
-rand = { workspace = true, default_features = false }
+rand = { workspace = true, features = ["thread_rng"], default_features = false }
 sentry = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
@@ -68,96 +68,97 @@ members = [".", "crates/*"]
 
 [workspace.package]
 authors = ["Orogene Maintainers and Contributors"]
-edition = "2021"
+edition = "2024"
 repository = "https://github.com/orogene/orogene"
 homepage = "https://orogene.dev"
-rust-version = "1.67.1"
+rust-version = "1.85"
 
 [workspace.dependencies]
-anyhow = "1.0.75"
-async-compression = "0.3.5"
-async-process = "1.0.1"
-async-std = "1.12.0"
-async-trait = "0.1.64"
-backon = "0.4.0"
-base64 = "0.21.2"
-bincode = "1.3.1"
-bytecount = "0.6.0"
-cacache = "12.0.0"
-chrono = "0.4.23"
-chrono-humanize = "0.0.11"
-clap = "4.2.1"
-colored = "2.0.0"
-config = { version = "0.13.2", default-features = false }
+anyhow = "1.0.96"
+async-compression = "0.4.12"
+async-process = "2.3.0"
+async-std = "1.13.0"
+async-trait = "0.1.86"
+backon = "1.4.0"
+base64 = "0.22.1"
+bincode = "1.3.3"
+bytecount = "0.6.8"
+cacache = { version = "13.1.0", default-features = false, features = ["mmap", "tokio-runtime"] }
+chrono = "0.4.40"
+chrono-humanize = "0.2.3"
+clap = "4.5.31"
+colored = "3.0.0"
+config = { version = "0.15.8", default-features = false }
 console_error_panic_hook = "0.1.7"
-darling = "0.10.2"
-dashmap = "4.0.0-rc6"
-derive_builder = "0.11.2"
+darling = "0.20.10"
+dashmap = "6.1.0"
+derive_builder = "0.20.2"
 dialoguer = { version = "0.10.4", default-features = false }
-directories = "4.0.1"
-dunce = "1.0.3"
-flate2 = "1.0.25"
-futures = "0.3.26"
-indexmap = "1.9.3"
-indicatif = "0.17.3"
+directories = "6.0.0"
+dunce = "1.0.5"
+flate2 = { version = "1.1.0", default-features = false }
+futures = "0.3.31"
+http = "1.2.0"
+indexmap = "2.7.1"
+indicatif = "0.17.11"
 io_tee = "0.1.1"
-is-terminal = "0.4.7"
-is_ci = "1.1.1"
-http-cache-reqwest = "0.6.0"
+is-terminal = "0.4.15"
+is_ci = "1.2.0"
+http-cache-reqwest = "0.15.1"
 humansize = "1.1.0"
-insta = "1.28.0"
-js-sys = "0.3.61"
-junction = "1.0.0"
-kdl = "5.0.0-alpha.1"
+insta = "1.42.2"
+js-sys = "0.3.77"
+junction = "1.2.0"
+kdl = { git = "https://github.com/elide-tools/kdl-rs.git", rev = "b76df4f16ce805798e6d513a6daedf97f6d28e5d" }
 maplit = "1.0.2"
-miette = "5.8.0"
-mockito = "1.0.0"
-node-semver = "2.1.0"
-nom = "7.1.3"
-once_cell = "1.17.1"
-open = "5.0.0"
-pathdiff = "0.2.1"
-percent-encoding = "2.1.0"
-petgraph = { version = "0.6.2", default-features = false }
-poloto = "17.1.0"
-pretty_assertions = "1.3.0"
-proc-macro2 = "1.0.18"
-quote = "1.0.7"
-rand = { version = "0.8.5", default-features = false }
-reflink-copy = "0.1.8"
-regex = "1.7.2"
-reqwest = "0.11.14"
-reqwest-middleware = "=0.2.2"
+miette = "7.5.0"
+mockito = "1.6.1"
+node-semver = "2.2.0"
+nom = "8.0.0"
+once_cell = "1.20.3"
+open = "5.3.2"
+pathdiff = "0.2.3"
+percent-encoding = "2.3.1"
+petgraph = { version = "0.7.1", default-features = false }
+poloto = "19.1.2"
+pretty_assertions = "1.4.1"
+proc-macro2 = "1.0.93"
+quote = "1.0.38"
+rand = { version = "0.9.0", features = ["thread_rng"] , default-features = false }
+reflink-copy = "0.1.24"
+regex = "1.11.1"
+reqwest = "0.12.12"
+reqwest-middleware = "0.4.1"
 resvg = "0.29.0"
-rkyv = "0.7.41"
-sentry = "0.31.0"
-serde = "1.0.152"
-serde_json = "1.0.93"
-serde-wasm-bindgen = "0.4.5"
-ssri = "9.0.0"
-supports-unicode = "2.0.0"
-syn = "1.0.33"
-tar = "0.4.38"
+rkyv = "0.8.10"
+sentry = "0.36.0"
+serde = "1.0.218"
+serde_json = "1.0.139"
+serde-wasm-bindgen = "0.6.5"
+ssri = "9.2.0"
+supports-unicode = "3.0.0"
+syn = "2.0.98"
+tar = "0.4.44"
 task-local-extensions = "0.1.4"
-tempfile = "3.3.0"
-term_grid = "0.1.7"
+tempfile = "3.17.1"
+term_grid = "0.2.0"
 term_size = "0.3.2"
-test-case = "3.0.0"
-thiserror = "1.0.38"
-tracing = "0.1.37"
-tracing-appender = "0.2.2"
-tracing-indicatif = "0.3.0"
-tracing-subscriber = "0.3.16"
-tsify = { version = "0.4.3", default-features = false }
-unicase = "2.6.0"
-url = "2.3.1"
-walkdir = "2.3.2"
-wasm-bindgen = "0.2.84"
-wasm-bindgen-futures = "0.4.34"
-wasm-streams = "0.3.0"
-which = "4.0.2"
-wiremock = "0.5.17"
-reqwest-retry = "0.2.2"
+test-case = "3.3.1"
+thiserror = "1.0.69"
+tracing = "0.1.41"
+tracing-appender = "0.2.3"
+tracing-indicatif = "0.3.9"
+tracing-subscriber = "0.3.19"
+tsify = { version = "0.4.5", default-features = false }
+unicase = "2.8.1"
+url = "2.5.4"
+walkdir = "2.5.0"
+wasm-bindgen = "0.2.100"
+wasm-bindgen-futures = "0.4.50"
+wasm-streams = "0.4.2"
+which = "7.0.2"
+wiremock = "0.6.3"
+reqwest-retry = "0.7.0"
 
 # [patch.crates-io]
 # cacache = { path = "../cacache-rs" }
@@ -168,7 +169,7 @@ reqwest-retry = "0.2.2"
 # The preferred cargo-dist version to use in CI (Cargo.toml SemVer syntax)
 cargo-dist-version = "0.3.1"
 # The preferred Rust toolchain to use in CI (rustup toolchain syntax)
-rust-toolchain-version = "1.72.1"
+rust-toolchain-version = "1.85.0"
 # CI backends to support
 ci = ["github"]
 # Target platforms to build apps for (Rust target-triple syntax)
@@ -190,7 +191,7 @@ pr-run-mode = "plan"
 allow-dirty = ["msi"]
 
 [build-dependencies]
-embed-resource = "1.3.3"
+embed-resource = "3.0.1"
 
 [[bin]]
 name = "oro"

Cargo.toml

@@ -1,3 +1,3 @@
 fn main() {
-    embed_resource::compile("oro-manifest.rc");
+    let _ = embed_resource::compile("oro-manifest.rc", embed_resource::NONE);
 }

build.rs

@@ -44,12 +44,12 @@ test-case = { workspace = true }
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 async-tar-wasm = "0.4.2-wasm.1"
 async-process = { workspace = true }
-async-std = { workspace = true, features = ["attributes", "std"] }
+async-std = { workspace = true, features = ["attributes", "std", "tokio1"] }
 backon = { workspace = true }
 cacache = { workspace = true }
-flate2 = { workspace = true }
+flate2 = { workspace = true, features = ["zlib-ng"] }
 io_tee = { workspace = true }
-rkyv = { workspace = true, features = ["validation"] }
+rkyv = { workspace = true }
 tar = { workspace = true }
 tempfile = { workspace = true }
 which = { workspace = true }

crates/nassun/Cargo.toml

@@ -52,7 +52,7 @@ impl NpmFetcher {
 impl NpmFetcher {
     fn _name<'a>(&'a self, spec: &'a PackageSpec) -> &'a str {
         match spec {
-            PackageSpec::Npm { ref name, .. } | PackageSpec::Alias { ref name, .. } => name,
+            PackageSpec::Npm { name, .. } | PackageSpec::Alias { name, .. } => name,
             _ => unreachable!(),
         }
     }
@@ -67,7 +67,7 @@ impl PackageFetcher for NpmFetcher {
 
     async fn corgi_metadata(&self, pkg: &Package) -> Result<CorgiVersionMetadata> {
         let wanted = match pkg.resolved() {
-            PackageResolution::Npm { ref version, .. } => version,
+            PackageResolution::Npm { version, .. } => version,
             _ => unreachable!(),
         };
         let packument = self.corgi_packument(pkg.from(), Path::new("")).await?;
@@ -80,7 +80,7 @@ impl PackageFetcher for NpmFetcher {
 
     async fn metadata(&self, pkg: &Package) -> Result<VersionMetadata> {
         let wanted = match pkg.resolved() {
-            PackageResolution::Npm { ref version, .. } => version,
+            PackageResolution::Npm { version, .. } => version,
             _ => unreachable!(),
         };
         let packument = self.packument(pkg.from(), Path::new("")).await?;
@@ -98,12 +98,7 @@ impl PackageFetcher for NpmFetcher {
     ) -> Result<Arc<CorgiPackument>> {
         // When fetching the packument itself, we need the _package_ name, not
         // its alias! Hence these shenanigans.
-        if let PackageSpec::Npm {
-            ref name,
-            ref scope,
-            ..
-        } = spec.target()
-        {
+        if let PackageSpec::Npm { name, scope, .. } = spec.target() {
             if let Some(packument) = self.corgi_packuments.get(name) {
                 if self.cache_packuments {
                     return Ok(packument.value().clone());
@@ -125,16 +120,11 @@ impl PackageFetcher for NpmFetcher {
         // When fetching the packument itself, we need the _package_ name, not
         // its alias! Hence these shenanigans.
         let pkg = match spec {
-            PackageSpec::Alias { ref spec, .. } => spec,
+            PackageSpec::Alias { spec, .. } => spec,
             pkg @ PackageSpec::Npm { .. } => pkg,
             _ => unreachable!(),
         };
-        if let PackageSpec::Npm {
-            ref name,
-            ref scope,
-            ..
-        } = pkg
-        {
+        if let PackageSpec::Npm { name, scope, .. } = pkg {
             if let Some(packument) = self.packuments.get(name) {
                 if self.cache_packuments {
                     return Ok(packument.value().clone());
@@ -153,7 +143,7 @@ impl PackageFetcher for NpmFetcher {
 
     async fn tarball(&self, pkg: &Package) -> Result<crate::TarballStream> {
         let url = match pkg.resolved() {
-            PackageResolution::Npm { ref tarball, .. } => tarball,
+            PackageResolution::Npm { tarball, .. } => tarball,
             _ => panic!("How did a non-Npm resolution get here?"),
         };
         Ok(self.client.stream_external(url).await?)

crates/nassun/src/fetch/npm.rs

@@ -272,7 +272,7 @@ impl Package {
         let name = self.name().to_owned();
         async_std::task::spawn_blocking(move || {
             let created = dashmap::DashSet::new();
-            let index = rkyv::check_archived_root::<TarballIndex>(
+            let index = rkyv::from_bytes::<TarballIndex, rkyv::rancor::Error>(
                 entry
                     .raw_metadata
                     .as_ref()
@@ -321,7 +321,7 @@ impl fmt::Debug for Package {
 
 #[cfg(not(target_arch = "wasm32"))]
 fn clean_from_cache(cache: &Path, sri: &Integrity, entry: cacache::Metadata) -> Result<()> {
-    let index = rkyv::check_archived_root::<TarballIndex>(
+    let index = rkyv::from_bytes::<TarballIndex, rkyv::rancor::Error>(
         entry
             .raw_metadata
             .as_ref()

crates/nassun/src/package.rs

@@ -148,7 +148,7 @@ impl PackageResolver {
         use PackageSpec::*;
         let spec = wanted.target();
 
-        if let Dir { ref path } = spec {
+        if let Dir { path } = spec {
             let p = self.base_dir.join(path);
             return Ok(PackageResolution::Dir {
                 name: name.into(),
@@ -175,7 +175,7 @@ impl PackageResolver {
 
         let mut target: Option<&SemVerVersion> = match spec {
             Npm {
-                requested: Some(VersionSpec::Version(ref version)),
+                requested: Some(VersionSpec::Version(version)),
                 ..
             } => Some(version),
             Npm {
@@ -216,7 +216,7 @@ impl PackageResolver {
 
         if target.is_none() {
             if let Npm {
-                requested: Some(VersionSpec::Range(ref range)),
+                requested: Some(VersionSpec::Range(range)),
                 ..
             } = spec
             {

crates/nassun/src/resolver.rs

@@ -377,8 +377,10 @@ impl TempTarball {
                     // This is just so the index entry is loadable.
                     .integrity("xxh3-deadbeef".parse().unwrap())
                     .raw_metadata(
-                        rkyv::util::to_bytes::<_, 1024>(&tarball_index)
-                            .map_err(|e| NassunError::SerializeCacheError(format!("{e}")))?
+                        rkyv::to_bytes(&tarball_index)
+                            .map_err(|e: rkyv::rancor::Error| {
+                                NassunError::SerializeCacheError(format!("{e}"))
+                            })?
                             .into_vec(),
                     ),
             )
@@ -410,8 +412,7 @@ impl std::io::Seek for TempTarball {
 }
 
 #[cfg(not(target_arch = "wasm32"))]
-#[derive(rkyv::Archive, rkyv::Serialize, Default)]
-#[archive(check_bytes)]
+#[derive(rkyv::Archive, rkyv::Serialize, rkyv::Deserialize, Default)]
 pub(crate) struct TarballIndex {
     pub(crate) should_copy: bool,
     pub(crate) bin_paths: Vec<String>,

crates/nassun/src/tarball.rs

@@ -19,18 +19,6 @@ use crate::{error::NodeMaintainerError, Lockfile, LockfileNode};
 #[cfg(debug_assertions)]
 use NodeMaintainerError::GraphValidationError;
 
-#[derive(Debug, Hash, PartialEq, Eq)]
-pub(crate) struct DemotionTarget {
-    /// Index of the target ancestor node that should hold the demoted copy.
-    pub(crate) target_idx: NodeIndex,
-
-    /// Index of the dependent node
-    pub(crate) dependent_idx: NodeIndex,
-
-    /// Index of the edge between dependency and dependent
-    pub(crate) edge_idx: EdgeIndex,
-}
-
 #[derive(Debug, Clone)]
 pub struct Node {
     /// Index of this Node inside its [`Graph`].
@@ -410,7 +398,7 @@ impl Graph {
             peer_dependencies: peer_deps,
             optional_dependencies: opt_deps,
             integrity: match node.package.resolved() {
-                PackageResolution::Npm { ref integrity, .. } => integrity.clone(),
+                PackageResolution::Npm { integrity, .. } => integrity.clone(),
                 _ => None,
             },
         })

crates/node-maintainer/src/graph.rs

@@ -191,7 +191,7 @@ impl<'a> Resolver<'a> {
             if let Some(packages) = package_stream.next().await {
                 for res in packages {
                     let (package, spec) = res?;
-                    let deps = fetches.lock().await.remove(&spec);
+                    let deps = fetches.lock().await.shift_remove(&spec);
 
                     if let Some(deps) = deps {
                         in_flight -= deps.len();