diff --git a/Cargo.lock b/Cargo.lock index 2dd7bfd32..063d38020 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1288,7 +1288,7 @@ dependencies = [ "semver", "serde", "serde_json", - "thiserror 2.0.6", + "thiserror 2.0.7", ] [[package]] @@ -1382,15 +1382,15 @@ dependencies = [ [[package]] name = "console" -version = "0.15.8" +version = "0.15.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" +checksum = "ea3c6ecd8059b57859df5c69830340ed3c41d30e3da0c1cbed90a96ac853041b" dependencies = [ "encode_unicode", - "lazy_static", "libc", - "unicode-width 0.1.12", - "windows-sys 0.52.0", + "once_cell", + "unicode-width 0.2.0", + "windows-sys 0.59.0", ] [[package]] @@ -1512,9 +1512,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.13" +version = "0.5.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471" dependencies = [ "crossbeam-utils", ] @@ -1843,9 +1843,9 @@ dependencies = [ [[package]] name = "encode_unicode" -version = "0.3.6" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" +checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" [[package]] name = "encoding_rs" @@ -2232,7 +2232,7 @@ dependencies = [ "regex", "signal-hook", "smallvec", - "thiserror 2.0.6", + "thiserror 2.0.7", ] [[package]] @@ -2245,7 +2245,7 @@ dependencies = [ "gix-date", "gix-utils", "itoa", - "thiserror 2.0.6", + "thiserror 2.0.7", "winnow 0.6.18", ] @@ -2260,7 +2260,7 @@ dependencies = [ "gix-object", "gix-worktree-stream", "jiff", - "thiserror 2.0.6", + "thiserror 2.0.7", ] [[package]] @@ -2276,7 +2276,7 @@ dependencies = [ "gix-trace", "kstring", "smallvec", - "thiserror 2.0.6", + "thiserror 2.0.7", "unicode-bom", ] @@ -2286,7 +2286,7 @@ version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d48b897b4bbc881aea994b4a5bbb340a04979d7be9089791304e04a9fbc66b53" dependencies = [ - "thiserror 2.0.6", + "thiserror 2.0.7", ] [[package]] @@ -2295,7 +2295,7 @@ version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6ffbeb3a5c0b8b84c3fe4133a6f8c82fa962f4caefe8d0762eced025d3eb4f7" dependencies = [ - "thiserror 2.0.6", + "thiserror 2.0.7", ] [[package]] @@ -2321,7 +2321,7 @@ dependencies = [ "gix-features", "gix-hash", "memmap2", - "thiserror 2.0.6", + "thiserror 2.0.7", ] [[package]] @@ -2340,7 +2340,7 @@ dependencies = [ "memchr", "once_cell", "smallvec", - "thiserror 2.0.6", + "thiserror 2.0.7", "unicode-bom", "winnow 0.6.18", ] @@ -2355,7 +2355,7 @@ dependencies = [ "bstr 1.9.1", "gix-path", "libc", - "thiserror 2.0.6", + "thiserror 2.0.7", ] [[package]] @@ -2372,7 +2372,7 @@ dependencies = [ "gix-sec", "gix-trace", "gix-url", - "thiserror 2.0.6", + "thiserror 2.0.7", ] [[package]] @@ -2384,7 +2384,7 @@ dependencies = [ "bstr 1.9.1", "itoa", "jiff", - "thiserror 2.0.6", + "thiserror 2.0.7", ] [[package]] @@ -2405,7 +2405,7 @@ dependencies = [ "gix-traverse", "gix-worktree", "imara-diff", - "thiserror 2.0.6", + "thiserror 2.0.7", ] [[package]] @@ -2425,7 +2425,7 @@ dependencies = [ "gix-trace", "gix-utils", "gix-worktree", - "thiserror 2.0.6", + "thiserror 2.0.7", ] [[package]] @@ -2441,7 +2441,7 @@ dependencies = [ "gix-path", "gix-ref", "gix-sec", - "thiserror 2.0.6", + "thiserror 2.0.7", ] [[package]] @@ -2463,7 +2463,7 @@ dependencies = [ "parking_lot", "prodash", "sha1_smol", - "thiserror 2.0.6", + "thiserror 2.0.7", "walkdir", ] @@ -2485,7 +2485,7 @@ dependencies = [ "gix-trace", "gix-utils", "smallvec", - "thiserror 2.0.6", + "thiserror 2.0.7", ] [[package]] @@ -2518,7 +2518,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b5eccc17194ed0e67d49285e4853307e4147e95407f91c1c3e4a13ba9f4e4ce" dependencies = [ "faster-hex", - "thiserror 2.0.6", + "thiserror 2.0.7", ] [[package]] @@ -2570,7 +2570,7 @@ dependencies = [ "memmap2", "rustix", "smallvec", - "thiserror 2.0.6", + "thiserror 2.0.7", ] [[package]] @@ -2581,7 +2581,7 @@ checksum = "1cd3ab68a452db63d9f3ebdacb10f30dba1fa0d31ac64f4203d395ed1102d940" dependencies = [ "gix-tempfile", "gix-utils", - "thiserror 2.0.6", + "thiserror 2.0.7", ] [[package]] @@ -2593,7 +2593,7 @@ dependencies = [ "bstr 1.9.1", "gix-actor", "gix-date", - "thiserror 2.0.6", + "thiserror 2.0.7", ] [[package]] @@ -2609,7 +2609,7 @@ dependencies = [ "gix-object", "gix-revwalk", "smallvec", - "thiserror 2.0.6", + "thiserror 2.0.7", ] [[package]] @@ -2628,7 +2628,7 @@ dependencies = [ "gix-validate", "itoa", "smallvec", - "thiserror 2.0.6", + "thiserror 2.0.7", "winnow 0.6.18", ] @@ -2650,7 +2650,7 @@ dependencies = [ "gix-quote", "parking_lot", "tempfile", - "thiserror 2.0.6", + "thiserror 2.0.7", ] [[package]] @@ -2668,7 +2668,7 @@ dependencies = [ "gix-path", "memmap2", "smallvec", - "thiserror 2.0.6", + "thiserror 2.0.7", "uluru", ] @@ -2681,7 +2681,7 @@ dependencies = [ "bstr 1.9.1", "faster-hex", "gix-trace", - "thiserror 2.0.6", + "thiserror 2.0.7", ] [[package]] @@ -2694,7 +2694,7 @@ dependencies = [ "gix-trace", "home", "once_cell", - "thiserror 2.0.6", + "thiserror 2.0.7", ] [[package]] @@ -2709,7 +2709,7 @@ dependencies = [ "gix-config-value", "gix-glob", "gix-path", - "thiserror 2.0.6", + "thiserror 2.0.7", ] [[package]] @@ -2722,7 +2722,7 @@ dependencies = [ "gix-config-value", "parking_lot", "rustix", - "thiserror 2.0.6", + "thiserror 2.0.7", ] [[package]] @@ -2733,7 +2733,7 @@ checksum = "64a1e282216ec2ab2816cd57e6ed88f8009e634aec47562883c05ac8a7009a63" dependencies = [ "bstr 1.9.1", "gix-utils", - "thiserror 2.0.6", + "thiserror 2.0.7", ] [[package]] @@ -2753,7 +2753,7 @@ dependencies = [ "gix-utils", "gix-validate", "memmap2", - "thiserror 2.0.6", + "thiserror 2.0.7", "winnow 0.6.18", ] @@ -2768,7 +2768,7 @@ dependencies = [ "gix-revision", "gix-validate", "smallvec", - "thiserror 2.0.6", + "thiserror 2.0.7", ] [[package]] @@ -2786,7 +2786,7 @@ dependencies = [ "gix-object", "gix-revwalk", "gix-trace", - "thiserror 2.0.6", + "thiserror 2.0.7", ] [[package]] @@ -2801,7 +2801,7 @@ dependencies = [ "gix-hashtable", "gix-object", "smallvec", - "thiserror 2.0.6", + "thiserror 2.0.7", ] [[package]] @@ -2836,7 +2836,7 @@ dependencies = [ "gix-pathspec", "gix-worktree", "portable-atomic", - "thiserror 2.0.6", + "thiserror 2.0.7", ] [[package]] @@ -2851,7 +2851,7 @@ dependencies = [ "gix-pathspec", "gix-refspec", "gix-url", - "thiserror 2.0.6", + "thiserror 2.0.7", ] [[package]] @@ -2890,7 +2890,7 @@ dependencies = [ "gix-object", "gix-revwalk", "smallvec", - "thiserror 2.0.6", + "thiserror 2.0.7", ] [[package]] @@ -2902,7 +2902,7 @@ dependencies = [ "bstr 1.9.1", "gix-features", "gix-path", - "thiserror 2.0.6", + "thiserror 2.0.7", "url", ] @@ -2924,7 +2924,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd520d09f9f585b34b32aba1d0b36ada89ab7fefb54a8ca3fe37fc482a750937" dependencies = [ "bstr 1.9.1", - "thiserror 2.0.6", + "thiserror 2.0.7", ] [[package]] @@ -2963,7 +2963,7 @@ dependencies = [ "gix-path", "gix-worktree", "io-close", - "thiserror 2.0.6", + "thiserror 2.0.7", ] [[package]] @@ -2981,7 +2981,7 @@ dependencies = [ "gix-path", "gix-traverse", "parking_lot", - "thiserror 2.0.6", + "thiserror 2.0.7", ] [[package]] @@ -4629,9 +4629,9 @@ dependencies = [ [[package]] name = "redb" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84b1de48a7cf7ba193e81e078d17ee2b786236eed1d3f7c60f8a09545efc4925" +checksum = "a7c2a94325f9c5826b17c42af11067230f503747f870117a28180e85696e21ba" dependencies = [ "libc", ] @@ -4973,7 +4973,7 @@ dependencies = [ "include_dir", "indoc", "io_tee", - "itertools 0.12.1", + "itertools 0.13.0", "libc", "libloading", "ntest", @@ -5005,7 +5005,7 @@ dependencies = [ "tar", "test-case", "test-for-each-example", - "thiserror 2.0.6", + "thiserror 2.0.7", "tokio", "toml", "toml_edit 0.22.22", @@ -5059,7 +5059,7 @@ dependencies = [ "serde_json", "snapbox", "starknet-types-core", - "thiserror 2.0.6", + "thiserror 2.0.7", ] [[package]] @@ -5103,7 +5103,7 @@ dependencies = [ "clap", "expect-test", "indoc", - "itertools 0.12.1", + "itertools 0.13.0", "rust-analyzer-salsa", "scarb-metadata 1.13.0", "scarb-test-support", @@ -5111,7 +5111,7 @@ dependencies = [ "serde", "serde_json", "smol_str", - "thiserror 2.0.6", + "thiserror 2.0.7", "walkdir", ] @@ -5127,7 +5127,7 @@ dependencies = [ "serde", "serde_json", "snapbox", - "thiserror 2.0.6", + "thiserror 2.0.7", ] [[package]] @@ -5194,7 +5194,7 @@ dependencies = [ "dunce", "hyper", "indoc", - "itertools 0.12.1", + "itertools 0.13.0", "scarb", "scarb-build-metadata", "scarb-proc-macro-server-types 0.1.0", @@ -5310,9 +5310,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.215" +version = "1.0.216" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" +checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e" dependencies = [ "serde_derive", ] @@ -5340,9 +5340,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.215" +version = "1.0.216" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" +checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e" dependencies = [ "proc-macro2", "quote", @@ -5885,11 +5885,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.6" +version = "2.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fec2a1820ebd077e2b90c4df007bebf344cd394098a13c563957d0afc83ea47" +checksum = "93605438cbd668185516ab499d589afb7ee1859ea3d5fc8f6b0755e1c7443767" dependencies = [ - "thiserror-impl 2.0.6", + "thiserror-impl 2.0.7", ] [[package]] @@ -5905,9 +5905,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.6" +version = "2.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d65750cab40f4ff1929fb1ba509e9914eb756131cef4210da8d5d700d26f6312" +checksum = "e1d8749b4531af2117677a5fcd12b1348a3fe2b81e36e61ffeac5c4aa3273e36" dependencies = [ "proc-macro2", "quote", @@ -6074,9 +6074,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.15" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac2caab0bf757388c6c0ae23b3293fdb463fee59434529014f85e3263b995c28" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", diff --git a/Cargo.toml b/Cargo.toml index 0fbab768b..c6a54eb3c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -94,7 +94,7 @@ include_dir = "0.7" indicatif = "0.17" indoc = "2" io_tee = "0.1" -itertools = "0.12" +itertools = "0.13" libc = "0.2" libloading = "0.8.6" linkme = "0.3" @@ -107,7 +107,7 @@ predicates = "3" proc-macro2 = "1" quote = "1" ra_ap_toolchain = "0.0.218" -redb = "2.2.0" +redb = "2.3.0" reqwest = { version = "0.11", features = ["gzip", "brotli", "deflate", "json", "stream", "multipart"], default-features = false } salsa = { package = "rust-analyzer-salsa", version = "0.17.0-pre.6" } semver = { version = "1", features = ["serde"] } diff --git a/scarb/Cargo.toml b/scarb/Cargo.toml index d1d093ab7..01c5b2527 100644 --- a/scarb/Cargo.toml +++ b/scarb/Cargo.toml @@ -37,7 +37,7 @@ camino.workspace = true clap.workspace = true convert_case.workspace = true create-output-dir = { path = "../utils/create-output-dir" } -crossbeam-channel = "0.5.13" +crossbeam-channel = "0.5.14" data-encoding.workspace = true deno_task_shell.workspace = true derive_builder.workspace = true diff --git a/scarb/src/core/registry/source_map.rs b/scarb/src/core/registry/source_map.rs index 59ef1f395..9d3e167da 100644 --- a/scarb/src/core/registry/source_map.rs +++ b/scarb/src/core/registry/source_map.rs @@ -30,7 +30,7 @@ impl<'c> SourceMap<'c> { pub fn preloaded(packages: impl Iterator, config: &'c Config) -> Self { let sources = packages .sorted_by_key(|pkg| pkg.id.source_id) - .group_by(|pkg| pkg.id.source_id); + .chunk_by(|pkg| pkg.id.source_id); let sources = sources.into_iter().map(|(source_id, packages)| { let packages = packages.collect::>(); let source = PathSource::preloaded(&packages, config); diff --git a/scarb/src/ops/resolve.rs b/scarb/src/ops/resolve.rs index b0a822353..d4d896ca8 100644 --- a/scarb/src/ops/resolve.rs +++ b/scarb/src/ops/resolve.rs @@ -261,7 +261,7 @@ fn generate_cairo_compilation_units( .targets .iter() .filter(|target| target.group_id.is_some()) - .group_by(|target| target.group_id.clone()) + .chunk_by(|target| target.group_id.clone()) .into_iter() .map(|(group_id, group)| (group_id, group.collect_vec())) .sorted_by_key(|(_, group)| group[0].kind.clone())