chore: upgrade to rust edition 2024, dep updates

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

Author: sgammon

Cargo.lock

@@ -51,7 +51,7 @@ is-terminal = { workspace = true }
 kdl = { workspace = true }
 miette = { workspace = true, features = ["fancy"] }
 mimalloc = { workspace = true, optional = true }
-rand = { workspace = true, default_features = false, features = ["thread_rng"] }
+rand = { workspace = true, features = ["thread_rng"] , default-features = false}
 sentry = { workspace = true, optional = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
@@ -80,10 +80,10 @@ 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.79"
+rust-version = "1.85"
 
 [features]
 default = ["alloc-snmalloc"]
@@ -94,82 +94,81 @@ alloc-jemalloc = ["tikv-jemallocator"]
 error-reporting = ["sentry"]
 
 [workspace.dependencies]
-anyhow = "1.0.80"
-async-compression = "0.4.6"
-async-process = "2.2.3"
-async-std = "1.12.0"
-async-trait = "0.1.80"
-backon = "1.3.0"
+anyhow = "1.0.96"
+async-compression = "0.4.20"
+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"
-bumpalo = { version = "3.16.0", features = ["serde", "collections", "boxed"] }
+bumpalo = { version = "3.17.0", features = ["serde", "collections", "boxed"] }
 bytecount = "0.6.8"
-cacache = { version = "13.0.0", default-features = false, features = ["mmap", "tokio-runtime"] }
-chrono = "0.4.31"
+cacache = { version = "13.1.0", default-features = false, features = ["mmap", "tokio-runtime"] }
+chrono = "0.4.40"
 chrono-humanize = "0.2.3"
-clap = "4.5.3"
+clap = "4.5.31"
 colored = "3.0.0"
-config = { version = "0.15.6", default-features = false }
+config = { version = "0.15.8", default-features = false }
 console_error_panic_hook = "0.1.7"
-darling = "0.20.9"
-dashmap = "6.0.1"
-derive_builder = "0.20.0"
+darling = "0.20.10"
+dashmap = "6.1.0"
+derive_builder = "0.20.2"
 dialoguer = { version = "0.10.4", default-features = false }  # needs attention
 directories = "6.0.0"
-dunce = "1.0.4"
-flate2 = { version = "1.0.28", default-features = false }
-futures = "0.3.30"
-http = "1.1.0"
-indexmap = "2.2.6"
-indicatif = "0.17.7"
+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.12"
-is_ci = "1.1.1"
-http-cache-reqwest = "0.15.0"
+is-terminal = "0.4.15"
+is_ci = "1.2.0"
+http-cache-reqwest = "0.15.1"
 humansize = "1.1.0"  # needs attention
-insta = "1.39.0"
-js-sys = "0.3.69"
-junction = "1.1.0"
+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" }
-#kdl = { git = "https://github.com/elide-tools/kdl-rs.git", rev = "6044ef9776f24f45004c36d7628b1f5fbd83c8ad" }
 maplit = "1.0.2"
-miette = "7.4.0"
+miette = "7.5.0"
 mimalloc = { version = "0.1.43" }
-mockito = "1.4.0"
-node-semver = "2.1.0"
-nom = "7.1.3"
-once_cell = "1.19.0"
-open = "5.1.4"
-pathdiff = "0.2.1"
+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.0"
-proc-macro2 = "1.0.86"
-quote = "1.0.36"
+pretty_assertions = "1.4.1"
+proc-macro2 = "1.0.93"
+quote = "1.0.38"
 rand = { version = "0.9.0", default-features = false }
-reflink-copy = "0.1.18"
-regex = "1.10.5"
-reqwest = { version = "0.12.3", default-features = true, features = ["native-tls", "http2", "charset", "json", "gzip", "stream"] }
-reqwest-middleware = "0.4.0"
+reflink-copy = "0.1.24"
+regex = "1.11.1"
+reqwest = { version = "0.12.12", default-features = false, features = ["native-tls", "http2", "charset", "json", "gzip", "stream"] }
+reqwest-middleware = "0.4.1"
 resvg = "0.29.0"
 rkyv = { version = "0.8.10" }
 sentry = "0.36.0"
-serde = "1.0.203"
-serde_json = "1.0.118"
+serde = "1.0.218"
+serde_json = "1.0.139"
 serde-wasm-bindgen = "0.6.5"
 simd-json = { version = "0.14.3", features = ["serde_impl", "known-key"] }
-snmalloc-rs = { version = "0.3.6", features = ["native-cpu", "lto"] }
+snmalloc-rs = { version = "0.3.8", features = ["native-cpu", "lto"] }
 ssri = "9.2.0"
 supports-unicode = "3.0.0"
-syn = "2.0.68"
-tar = "0.4.41"
+syn = "2.0.98"
+tar = "0.4.44"
 task-local-extensions = "0.1.4"
-tempfile = "3.10.1"
+tempfile = "3.17.1"
 term_grid = "0.2.0"
 term_size = "0.3.2"
 test-case = "3.3.1"
-thiserror = "1.0.69"
+thiserror = "1.0.69" # needs attention
 tikv-jemallocator = { version = "0.6.0", features = ["background_threads"] }
 tokio = { version = "1", default-features = false, features = [
     "fs",
@@ -179,19 +178,19 @@ tokio = { version = "1", default-features = false, features = [
     "rt-multi-thread",
     "sync",
 ] }
-tracing = "0.1.40"
+tracing = "0.1.41"
 tracing-appender = "0.2.3"
-tracing-indicatif = "0.3.6"
-tracing-subscriber = "0.3.18"
+tracing-indicatif = "0.3.9"
+tracing-subscriber = "0.3.19"
 tsify = { version = "0.4.5", default-features = false }
-unicase = "2.7.0"
-url = "2.5.2"
+unicase = "2.8.1"
+url = "2.5.4"
 walkdir = "2.5.0"
-wasm-bindgen = "0.2.92"
-wasm-bindgen-futures = "0.4.42"
-wasm-streams = "0.4.0"
-which = "7.0.0"
-wiremock = "0.6.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]

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?;
@@ -99,8 +99,8 @@ impl PackageFetcher for NpmFetcher {
         // When fetching the packument itself, we need the _package_ name, not
         // its alias! Hence these shenanigans.
         if let PackageSpec::Npm {
-            ref name,
-            ref scope,
+            name,
+            scope,
             ..
         } = spec.target()
         {
@@ -125,13 +125,13 @@ 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,
+            name,
+            scope,
             ..
         } = pkg
         {
@@ -153,7 +153,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

@@ -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

@@ -398,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,
             },
         })