diff --git a/Cargo.lock b/Cargo.lock index 6b9869802a..aa145ca846 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -61,6 +61,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "allocator-api2" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" + [[package]] name = "android-activity" version = "0.5.2" @@ -316,7 +322,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "rustc-hash 1.1.0", + "rustc-hash", "shlex", "syn", ] @@ -1212,12 +1218,6 @@ dependencies = [ "spin", ] -[[package]] -name = "foldhash" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f" - [[package]] name = "foreign-types" version = "0.5.0" @@ -1554,13 +1554,13 @@ dependencies = [ [[package]] name = "gpu-descriptor" -version = "0.3.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf29e94d6d243368b7a56caa16bc213e4f9f8ed38c4d9557069527b5d5281ca" +checksum = "9c08c1f623a8d0b722b8b99f821eb0ba672a1618f0d3b16ddbee1cedd2dd8557" dependencies = [ "bitflags 2.6.0", "gpu-descriptor-types", - "hashbrown", + "hashbrown 0.14.5", ] [[package]] @@ -1593,13 +1593,20 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.15.2" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ - "foldhash", + "ahash", + "allocator-api2", ] +[[package]] +name = "hashbrown" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" + [[package]] name = "heck" version = "0.4.1" @@ -1824,7 +1831,7 @@ checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" dependencies = [ "arbitrary", "equivalent", - "hashbrown", + "hashbrown 0.15.2", "serde", ] @@ -2178,7 +2185,7 @@ dependencies = [ "pp-rs", "ron", "rspirv", - "rustc-hash 2.1.0", + "rustc-hash", "serde", "spirv 0.3.0+sdk-1.3.268.0", "strum 0.26.3", @@ -2873,7 +2880,7 @@ name = "rspirv" version = "0.11.0+sdk-1.2.198" source = "git+https://github.com/gfx-rs/rspirv?rev=b969f175d5663258b4891e44b76c1544da9661ab#b969f175d5663258b4891e44b76c1544da9661ab" dependencies = [ - "rustc-hash 1.1.0", + "rustc-hash", "spirv 0.2.0+sdk-1.2.198", ] @@ -2895,12 +2902,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" -[[package]] -name = "rustc-hash" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497" - [[package]] name = "rustc_version" version = "0.2.3" @@ -3157,7 +3158,7 @@ dependencies = [ "data-encoding", "debugid", "if_chain", - "rustc-hash 1.1.0", + "rustc-hash", "rustc_version", "serde", "serde_json", @@ -4031,7 +4032,7 @@ dependencies = [ "profiling", "raw-window-handle 0.6.2", "ron", - "rustc-hash 2.1.0", + "rustc-hash", "serde", "smallvec", "thiserror 2.0.9", @@ -4110,7 +4111,7 @@ dependencies = [ "raw-window-handle 0.5.2", "raw-window-handle 0.6.2", "renderdoc-sys", - "rustc-hash 2.1.0", + "rustc-hash", "smallvec", "thiserror 2.0.9", "wasm-bindgen", diff --git a/Cargo.toml b/Cargo.toml index 79d9858435..98134834e2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -122,9 +122,10 @@ raw-window-handle = "0.6" rayon = "1" renderdoc-sys = "1.1.0" ron = "0.8" -rustc-hash = "2.1.0" -serde = "1" +# rustc-hash 2.0 is a completely different hasher with different performance characteristics serde_json = "1.0.134" +rustc-hash = "1" +serde = "1" smallvec = "1" static_assertions = "1.1.0" strum = { version = "0.26.0", features = ["derive"] }