Move everything to workspace dependencies

This commit is contained in:
Connor Fitzgerald 2025-04-25 15:02:27 -04:00 committed by Andreas Reich
parent 30b247a8d1
commit fa702f9141
6 changed files with 47 additions and 32 deletions

View File

@ -76,6 +76,11 @@ wgpu-macros = { version = "25.0.0", path = "./wgpu-macros" }
wgpu-test = { version = "25.0.0", path = "./tests" } wgpu-test = { version = "25.0.0", path = "./tests" }
wgpu-types = { version = "25.0.0", path = "./wgpu-types" } wgpu-types = { version = "25.0.0", path = "./wgpu-types" }
# These _cannot_ have a version specified. If it does, crates.io will look
# for a version of the package on crates when we publish naga. Path dependencies
# are allowed through though.
hlsl-snapshots = { path = "naga/hlsl-snapshots" }
wgpu-core-deps-windows-linux-android = { version = "25.0.0", path = "./wgpu-core/platform-deps/windows-linux-android" } wgpu-core-deps-windows-linux-android = { version = "25.0.0", path = "./wgpu-core/platform-deps/windows-linux-android" }
wgpu-core-deps-apple = { version = "25.0.0", path = "./wgpu-core/platform-deps/apple" } wgpu-core-deps-apple = { version = "25.0.0", path = "./wgpu-core/platform-deps/apple" }
wgpu-core-deps-wasm = { version = "25.0.0", path = "./wgpu-core/platform-deps/wasm" } wgpu-core-deps-wasm = { version = "25.0.0", path = "./wgpu-core/platform-deps/wasm" }
@ -83,6 +88,7 @@ wgpu-core-deps-emscripten = { version = "25.0.0", path = "./wgpu-core/platform-d
anyhow = { version = "1.0.97", default-features = false } anyhow = { version = "1.0.97", default-features = false }
approx = "0.5" approx = "0.5"
arbitrary = "1.4.1"
argh = "0.1.13" argh = "0.1.13"
arrayvec = { version = "0.7.6", default-features = false } arrayvec = { version = "0.7.6", default-features = false }
bincode = "1" bincode = "1"
@ -99,6 +105,7 @@ cfg-if = "1"
criterion = "0.5" criterion = "0.5"
codespan-reporting = { version = "0.12", default-features = false } codespan-reporting = { version = "0.12", default-features = false }
ctor = "0.4" ctor = "0.4"
diff = "0.1"
document-features = "0.2.11" document-features = "0.2.11"
encase = "0.11.0" encase = "0.11.0"
env_logger = "0.11.8" env_logger = "0.11.8"
@ -111,17 +118,23 @@ hashbrown = { version = "0.15.2", default-features = false, features = [
"default-hasher", "default-hasher",
"inline-more", "inline-more",
] } ] }
heck = "0.5.0" heck = "0.5"
hexf-parse = "0.2.1"
image = { version = "0.25", default-features = false, features = ["png"] } image = { version = "0.25", default-features = false, features = ["png"] }
indexmap = { version = "2.7.1", default-features = false } indexmap = { version = "2.7.1", default-features = false }
itertools = { version = "0.14.0" } itertools = { version = "0.14.0" }
ktx2 = "0.4" ktx2 = "0.4"
libc = { version = "0.2.168", default-features = false } libc = { version = "0.2.168", default-features = false }
# See https://github.com/rust-fuzz/libfuzzer/issues/126
libfuzzer-sys = ">0.4.0,<=0.4.7"
libloading = "0.8" libloading = "0.8"
libtest-mimic = "0.8.1" libtest-mimic = "0.8.1"
log = "0.4.21" log = "0.4.21"
nanoserde = "0.2.1"
nanorand = { version = "0.7", default-features = false, features = ["wyrand"] } nanorand = { version = "0.7", default-features = false, features = ["wyrand"] }
noise = "0.9" noise = "0.9"
# `half` requires 0.2.16 for `FromBytes` and `ToBytes`.
num-traits = { version = "0.2.16", default-features = false }
nv-flip = "0.1" nv-flip = "0.1"
obj = "0.10" obj = "0.10"
# NOTE: once_cell/std is *required* for some commonly-used features, selecting this per crate # NOTE: once_cell/std is *required* for some commonly-used features, selecting this per crate
@ -129,6 +142,7 @@ once_cell = { version = "1.21.3", default-features = false }
# Firefox has 3.4.0 vendored, so we allow that version in our dependencies # Firefox has 3.4.0 vendored, so we allow that version in our dependencies
ordered-float = { version = ">=3, <=5.0", default-features = false } ordered-float = { version = ">=3, <=5.0", default-features = false }
parking_lot = "0.12.3" parking_lot = "0.12.3"
petgraph = { version = "0.8", default-features = false }
pico-args = { version = "0.5.0", features = [ pico-args = { version = "0.5.0", features = [
"eq-separator", "eq-separator",
"short-space-opt", "short-space-opt",
@ -137,10 +151,14 @@ pico-args = { version = "0.5.0", features = [
png = "0.17.16" png = "0.17.16"
pollster = "0.4" pollster = "0.4"
portable-atomic = "1.10.0" portable-atomic = "1.10.0"
pp-rs = "0.2.1"
profiling = { version = "1", default-features = false } profiling = { version = "1", default-features = false }
quote = "1.0.38"
raw-window-handle = { version = "0.6.2", default-features = false } raw-window-handle = { version = "0.6.2", default-features = false }
rwh_05 = { version = "0.5.2", package = "raw-window-handle" } # temporary compatibility for glutin-winit
rayon = "1.3.0" rayon = "1.3.0"
renderdoc-sys = "1.1.0" renderdoc-sys = "1.1.0"
rspirv = { version = "0.11", git = "https://github.com/gfx-rs/rspirv", rev = "b969f175d5663258b4891e44b76c1544da9661ab" }
ron = "0.10" ron = "0.10"
# NOTE: rustc-hash v2 is a completely different hasher with different performance characteristics # NOTE: rustc-hash v2 is a completely different hasher with different performance characteristics
# see discussion here (including with some other alternatives): https://github.com/gfx-rs/wgpu/issues/6999 # see discussion here (including with some other alternatives): https://github.com/gfx-rs/wgpu/issues/6999
@ -149,11 +167,15 @@ rustc-hash = { version = "1.1.0", default-features = false }
serde_json = "1.0.140" serde_json = "1.0.140"
serde = { version = "1.0.219", default-features = false } serde = { version = "1.0.219", default-features = false }
smallvec = "1.9.0" smallvec = "1.9.0"
spirv = "0.3"
static_assertions = "1.1.0" static_assertions = "1.1.0"
strum = { version = "0.27.1", default-features = false, features = ["derive"] } strum = { version = "0.27.1", default-features = false, features = ["derive"] }
syn = "2.0.98"
toml = "0.8"
trybuild = "1" trybuild = "1"
tracy-client = "0.18" tracy-client = "0.18"
thiserror = { version = "2.0.3", default-features = false } thiserror = { version = "2.0.3", default-features = false }
unicode-ident = "1.0.5"
walkdir = "2.3.0" walkdir = "2.3.0"
winit = { version = "0.29", features = ["android-native-activity"] } winit = { version = "0.29", features = ["android-native-activity"] }

View File

@ -81,49 +81,42 @@ termcolor = ["codespan-reporting/termcolor"]
stderr = ["codespan-reporting/std"] stderr = ["codespan-reporting/std"]
[dependencies] [dependencies]
arbitrary = { version = "1.4.1", features = ["derive"], optional = true } arbitrary = { workspace = true, features = ["derive"], optional = true }
arrayvec.workspace = true arrayvec.workspace = true
bitflags.workspace = true bitflags.workspace = true
bit-set.workspace = true bit-set.workspace = true
cfg-if.workspace = true cfg-if.workspace = true
codespan-reporting = { workspace = true, default-features = false } codespan-reporting = { workspace = true }
hashbrown.workspace = true hashbrown.workspace = true
half = { workspace = true, default-features = false, features = ["num-traits"] } half = { workspace = true, features = ["num-traits"] }
rustc-hash.workspace = true rustc-hash.workspace = true
indexmap.workspace = true indexmap.workspace = true
log.workspace = true log.workspace = true
# `half` requires 0.2.16 for `FromBytes` and `ToBytes`. num-traits.workspace = true
num-traits = { version = "0.2.16", default-features = false }
once_cell = { workspace = true, features = ["alloc", "race"] } once_cell = { workspace = true, features = ["alloc", "race"] }
strum = { workspace = true, optional = true } strum = { workspace = true, optional = true }
spirv = { version = "0.3", optional = true } spirv = { workspace = true, optional = true }
thiserror.workspace = true thiserror.workspace = true
serde = { version = "1.0.219", default-features = false, features = [ serde = { workspace = true, features = ["alloc", "derive"], optional = true }
"alloc", petgraph = { workspace = true, optional = true }
"derive", pp-rs = { workspace = true, optional = true }
], optional = true } hexf-parse = { workspace = true, optional = true }
petgraph = { version = "0.8", optional = true, default-features = false } unicode-ident = { workspace = true, optional = true }
pp-rs = { version = "0.2.1", optional = true }
hexf-parse = { version = "0.2.1", optional = true }
unicode-ident = { version = "1.0.5", optional = true }
[build-dependencies] [build-dependencies]
cfg_aliases.workspace = true cfg_aliases.workspace = true
[dev-dependencies] [dev-dependencies]
diff = "0.1" diff.workspace = true
env_logger.workspace = true env_logger.workspace = true
hashbrown = { workspace = true, features = ["serde"] } hashbrown = { workspace = true, features = ["serde"] }
# This _cannot_ have a version specified. If it does, crates.io will look hlsl-snapshots.workspace = true
# for a version of the package on crates when we publish naga. Path dependencies
# are allowed through though.
hlsl-snapshots = { path = "./hlsl-snapshots" }
itertools.workspace = true itertools.workspace = true
ron.workspace = true ron.workspace = true
rspirv = { version = "0.11", git = "https://github.com/gfx-rs/rspirv", rev = "b969f175d5663258b4891e44b76c1544da9661ab" } rspirv.workspace = true
serde = { workspace = true, features = ["default", "derive"] } serde = { workspace = true, features = ["default", "derive"] }
spirv = { version = "0.3", features = ["deserialize"] } spirv = { workspace = true, features = ["deserialize"] }
toml = "0.8" toml.workspace = true
walkdir.workspace = true walkdir.workspace = true
[lints.clippy] [lints.clippy]

View File

@ -11,9 +11,8 @@ build = "build.rs"
cargo-fuzz = true cargo-fuzz = true
[target.'cfg(not(any(target_arch = "wasm32", target_os = "ios")))'.dependencies] [target.'cfg(not(any(target_arch = "wasm32", target_os = "ios")))'.dependencies]
arbitrary = { version = "1.4.1", features = ["derive"] } arbitrary = { workspace = true, features = ["derive"] }
# See https://github.com/rust-fuzz/libfuzzer/issues/126 libfuzzer-sys.workspace = true
libfuzzer-sys = ">0.4.0,<=0.4.7"
[target.'cfg(not(any(target_arch = "wasm32", target_os = "ios", target_os = "visionos")))'.dependencies.naga] [target.'cfg(not(any(target_arch = "wasm32", target_os = "ios", target_os = "visionos")))'.dependencies.naga]
workspace = true workspace = true

View File

@ -11,5 +11,5 @@ path = "src/lib.rs"
test = false test = false
[dependencies] [dependencies]
anyhow = "1.0.97" anyhow.workspace = true
nanoserde = "0.2.1" nanoserde.workspace = true

View File

@ -328,5 +328,6 @@ winit.workspace = true # for "halmark"
[target.'cfg(not(any(target_arch = "wasm32", target_os = "ios", target_os = "visionos")))'.dev-dependencies] [target.'cfg(not(any(target_arch = "wasm32", target_os = "ios", target_os = "visionos")))'.dev-dependencies]
glutin-winit = { workspace = true, features = ["egl", "wgl", "wayland", "x11"] } glutin-winit = { workspace = true, features = ["egl", "wgl", "wayland", "x11"] }
glutin = { workspace = true, features = ["egl", "wgl", "wayland", "x11"] } glutin = { workspace = true, features = ["egl", "wgl", "wayland", "x11"] }
rwh_05 = { version = "0.5.2", package = "raw-window-handle" } # temporary compatibility for glutin-winit # temporary compatibility for glutin-winit
rwh_05.workspace = true
winit = { workspace = true, features = ["rwh_05"] } winit = { workspace = true, features = ["rwh_05"] }

View File

@ -16,6 +16,6 @@ publish = false
proc-macro = true proc-macro = true
[dependencies] [dependencies]
heck = "0.5" heck.workspace = true
quote = "1.0.38" quote.workspace = true
syn = { version = "2.0.98", features = ["full"] } syn = { workspace = true, features = ["full"] }