difftest: cargo windows bug workaround, mirror all workspace dependencies

Author: Firestar99

Cargo.toml

@@ -52,7 +52,9 @@ rustc_codegen_spirv = { path = "./crates/rustc_codegen_spirv", version = "=0.9.0
 rustc_codegen_spirv-types = { path = "./crates/rustc_codegen_spirv-types", version = "=0.9.0" }
 
 # difftest libraries mirrored from difftest workspace
+difftest = { path = "tests/difftests/tests/lib" }
 difftest-runner = { path = "tests/difftests/runner", default-features = false }
+difftest-types = { path = "tests/difftests/types" }
 
 # External dependencies that need to be mentioned more than once.
 tracing = "0.1"

crates/rustc_codegen_spirv/Cargo.toml

@@ -34,7 +34,7 @@ skip-toolchain-check = []
 # HACK(eddyb) these only exist to unify features across dependency trees,
 # in order to avoid multiple separate instances of `rustc_codegen_spirv`.
 ahash = { version = "0.8.11", features = ["no-rng"] }
-bytemuck = { version = "1.20.0", features = ["aarch64_simd", "derive"] }
+bytemuck = { workspace = true, features = ["aarch64_simd"] }
 log = { version = "0.4.22", features = ["std"] }
 regex = { version = "1", features = ["perf"] }
 rustix = { version = "1.0.8", features = ["all-apis"] }

crates/spirv-std/Cargo.toml

@@ -14,7 +14,7 @@ workspace = true
 spirv-std-types.workspace = true
 spirv-std-macros.workspace = true
 bitflags = "1.3.2"
-bytemuck = { version = "1.18.0", features = ["derive"], optional = true }
+bytemuck = { workspace = true, optional = true }
 
 [target.'cfg(target_arch = "spirv")'.dependencies]
 num-traits = { workspace = true, features = ["libm"] }

tests/difftests/tests/Cargo.toml

@@ -61,6 +61,9 @@ unexpected_cfgs = { level = "allow", check-cfg = [
     'cfg(target_arch, values("spirv"))',
 ] }
 
+# Cargo Windows bug: workspace dependencies of crates.io dependencies are resolved
+# incorrectly in the root workspace instead of this difftest workspace. So all
+# workspace dependencies here must be mirrored into the root workspace as well.
 [workspace.dependencies]
 spirv-builder = { path = "../../../crates/spirv-builder", default-features = false }
 spirv-std = { path = "../../../crates/spirv-std", version = "=0.9.0" }
@@ -69,7 +72,7 @@ difftest-types = { path = "../types" }
 # External dependencies that need to be mentioned more than once.
 num-traits = { version = "0.2.15", default-features = false }
 glam = { version = ">=0.30.8", default-features = false }
-bytemuck = { version = "1.14", features = ["derive"] }
+bytemuck = { version = "1.23", features = ["derive"] }
 
 # Enable incremental by default in release mode.
 [profile.release]