rustc_codegen_spirv: update Cargo.toml phony deps for feature unification.

Author: eddyb

Cargo.lock

@@ -33,11 +33,11 @@ skip-toolchain-check = []
 [dependencies]
 # HACK(eddyb) these only exist to unify features across dependency trees,
 # in order to avoid multiple separate instances of `rustc_codegen_spirv`.
-hashbrown = "0.11"
-libc = { version = "0.2", features = ["align", "extra_traits"] }
-num-traits = { workspace = true, default-features = true }
-once_cell = "1"
+ahash = { version = "0.8.11", features = ["no-rng"] }
+bytemuck = { version = "1.20.0", features = ["aarch64_simd", "derive"] }
+log = { version = "0.4.22", features = ["std"] }
 regex = { version = "1", features = ["perf"] }
+rustix = { version = "0.38.42", features = ["all-apis"] }
 
 # HACK(eddyb) deps of `rustc_codegen_ssa`, for `pqp_cg_ssa` (see `build.rs`),
 # that cannot be handled with just `extern crate` pulling out of the sysroot.
@@ -52,7 +52,7 @@ rspirv = "0.12"
 rustc_codegen_spirv-types.workspace = true
 rustc-demangle = "0.1.21"
 sanitize-filename = "0.4"
-smallvec = { version = "1.6.1", features = ["union"] }
+smallvec = { version = "1.6.1", features = ["const_generics", "const_new", "union"] }
 spirt = "0.4.0"
 spirv-tools.workspace = true
 lazy_static = "1.4.0"
@@ -66,6 +66,11 @@ pretty_assertions = "1.0"
 # (see `build.rs`).
 # tempfile = "3.4"
 
+# HACK(eddyb) deps of `rustc_codegen_ssa`, for `pqp_cg_ssa` (see `build.rs`),
+# that cannot be handled with just `extern crate` pulling out of the sysroot.
+[target.'cfg(unix)'.dependencies]
+libc = "0.2.50"
+
 # Note that in order to use RA and have access to `rustc_*` crates, you also
 # need to set `"rust-analyzer.rustcSource": "discover"` in e.g. VSCode.
 [package.metadata.rust-analyzer]

crates/rustc_codegen_spirv/Cargo.toml

@@ -30,6 +30,10 @@ skip = [
     # HACK(eddyb) two versions coexist for interop, for the time being.
     { name = "raw-window-handle", version = "=0.5.2" },
     { name = "raw-window-handle", version = "=0.6.2" },
+
+    # HACK(eddyb) the newer version hasn't propagated through the ecosystem yet.
+    { name = "hashbrown", version = "=0.14.5" },
+    { name = "hashbrown", version = "=0.15.2" },
 ]
 # Similarly to `skip` allows you to skip certain crates during duplicate
 # detection. Unlike skip, it also includes the entire tree of transitive
@@ -48,9 +52,6 @@ skip-tree = [
     # FIXME(eddyb) outdated `winit` version uses older `windows-*`,
     # requires an upgrade to `winit 0.30` to resolve.
     { name = "winit", version = "=0.29.15", depth = 4 },
-
-    # FIXME(eddyb) resolve everything hidden by this.
-    { name = "rustc_codegen_spirv", depth = 2 },
 ]