File tree Expand file tree Collapse file tree 4 files changed +8
-3
lines changed
Expand file tree Collapse file tree 4 files changed +8
-3
lines changed Original file line number Diff line number Diff line change @@ -85,7 +85,9 @@ expect-test = "1.5.1"
8585regex-lite = " 0.1.9"
8686
8787# difftest libraries mirrored from difftest workspace
88+ difftest = { path = " tests/difftests/tests/lib" }
8889difftest-runner = { path = " tests/difftests/runner" , default-features = false }
90+ difftest-types = { path = " tests/difftests/types" }
8991
9092# External dependencies that need to be mentioned more than once.
9193tracing = " 0.1"
Original file line number Diff line number Diff line change @@ -34,7 +34,7 @@ skip-toolchain-check = []
3434# HACK(eddyb) these only exist to unify features across dependency trees,
3535# in order to avoid multiple separate instances of `rustc_codegen_spirv`.
3636ahash = { version = " 0.8.11" , features = [" no-rng" ] }
37- bytemuck = { version = " 1.20.0 " , features = [" aarch64_simd" , " derive " ] }
37+ bytemuck = { workspace = true , features = [" aarch64_simd" ] }
3838log = { version = " 0.4.22" , features = [" std" ] }
3939regex = { version = " 1" , features = [" perf" ] }
4040rustix = { version = " 1.0.8" , features = [" all-apis" ] }
Original file line number Diff line number Diff line change @@ -14,7 +14,7 @@ workspace = true
1414spirv-std-types.workspace = true
1515spirv-std-macros.workspace = true
1616bitflags = " 1.3.2"
17- bytemuck = { version = " 1.18.0 " , features = [ " derive " ] , optional = true }
17+ bytemuck = { workspace = true , optional = true }
1818
1919[target .'cfg(target_arch = "spirv")' .dependencies ]
2020num-traits = { workspace = true , features = [" libm" ] }
Original file line number Diff line number Diff line change @@ -61,6 +61,9 @@ unexpected_cfgs = { level = "allow", check-cfg = [
6161 ' cfg(target_arch, values("spirv"))' ,
6262] }
6363
64+ # Cargo Windows bug: workspace dependencies of crates.io dependencies are resolved
65+ # incorrectly in the root workspace instead of this difftest workspace. So all
66+ # workspace dependencies here must be mirrored into the root workspace as well.
6467[workspace .dependencies ]
6568spirv-builder = { path = " ../../../crates/spirv-builder" , default-features = false }
6669spirv-std = { path = " ../../../crates/spirv-std" , version = " =0.9.0" }
@@ -69,7 +72,7 @@ difftest-types = { path = "../types" }
6972# External dependencies that need to be mentioned more than once.
7073num-traits = { version = " 0.2.15" , default-features = false }
7174glam = { version = " >=0.30.8" , default-features = false }
72- bytemuck = { version = " 1.14 " , features = [" derive" ] }
75+ bytemuck = { version = " 1.23 " , features = [" derive" ] }
7376
7477# Enable incremental by default in release mode.
7578[profile .release ]
You can’t perform that action at this time.
0 commit comments