Refactor Cargo.toml Significantly (#6980)

gfx-rs · Jan 23, 2025 · d8e7ab1 · d8e7ab1
1 parent 04aff59
commit d8e7ab1
Show file tree

Hide file tree

Showing 49 changed files with 425 additions and 483 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -55,7 +55,7 @@ env:
   RUSTFLAGS: -D warnings
   RUSTDOCFLAGS: -D warnings
   WASM_BINDGEN_TEST_TIMEOUT: 300 # 5 minutes
-  CACHE_SUFFIX: c # cache busting
+  CACHE_SUFFIX: d # cache busting
   WGPU_TESTING: true
 
 # We distinguish the following kinds of builds:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -56,26 +56,21 @@ repository = "https://github.com/gfx-rs/wgpu"
 version = "24.0.0"
 authors = ["gfx-rs developers"]
 
-[workspace.dependencies.wgc]
-package = "wgpu-core"
-path = "./wgpu-core"
-version = "24.0.0"
-
-[workspace.dependencies.wgt]
-package = "wgpu-types"
-path = "./wgpu-types"
-version = "24.0.0"
-
-[workspace.dependencies.hal]
-package = "wgpu-hal"
-path = "./wgpu-hal"
-version = "24.0.0"
-
-[workspace.dependencies.naga]
-path = "./naga"
-version = "24.0.0"
-
 [workspace.dependencies]
+naga = { version = "24.0.0", path = "./naga" }
+wgpu = { version = "24.0.0", path = "./wgpu", default-features = false, features = [
+    "serde",
+    "wgsl",
+    "dx12",
+    "metal",
+    "static-dxc",
+] }
+wgpu-core = { version = "24.0.0", path = "./wgpu-core" }
+wgpu-hal = { version = "24.0.0", path = "./wgpu-hal" }
+wgpu-macros = { version = "24.0.0", path = "./wgpu-macros" }
+wgpu-test = { version = "24.0.0", path = "./tests" }
+wgpu-types = { version = "24.0.0", path = "./wgpu-types" }
+
 anyhow = "1.0.95"
 argh = "0.1.13"
 arrayvec = "0.7"
@@ -141,17 +136,6 @@ strum = { version = "0.26.0", features = ["derive"] }
 trybuild = "1"
 tracy-client = "0.17"
 thiserror = "2"
-wgpu = { version = "24.0.0", path = "./wgpu", default-features = false, features = [
-    "serde",
-    "wgsl",
-    "dx12",
-    "metal",
-    "static-dxc",
-] }
-wgpu-core = { version = "24.0.0", path = "./wgpu-core" }
-wgpu-macros = { version = "24.0.0", path = "./wgpu-macros" }
-wgpu-test = { version = "24.0.0", path = "./tests" }
-wgpu-types = { version = "24.0.0", path = "./wgpu-types" }
 winit = { version = "0.29", features = ["android-native-activity"] }
 
 # Metal dependencies
@@ -166,7 +150,7 @@ ash = "0.38.0"
 gpu-alloc = "0.6"
 gpu-descriptor = "0.3"
 
-# DX dependencies
+# DX12 dependencies
 bit-set = "0.8"
 gpu-allocator = { version = "0.27", default-features = false }
 range-alloc = "0.1"
@@ -180,7 +164,7 @@ glutin = { version = "0.31", default-features = false }
 glutin-winit = { version = "0.4", default-features = false }
 glutin_wgl_sys = "0.6"
 
-# DX and GLES dependencies
+# DX12 and GLES dependencies
 windows = { version = "0.58", default-features = false }
 
 # wasm32 dependencies
@@ -206,21 +190,8 @@ termcolor = "1.4.1"
 # android dependencies
 ndk-sys = "0.5.0"
 
-[patch."https://github.com/gfx-rs/naga"]
-
-[patch."https://github.com/zakarumych/gpu-descriptor"]
-#gpu-descriptor = { path = "../gpu-descriptor/gpu-descriptor" }
-
-[patch."https://github.com/zakarumych/gpu-alloc"]
-#gpu-alloc = { path = "../gpu-alloc/gpu-alloc" }
-
-[patch.crates-io]
-#glow = { path = "../glow" }
-#web-sys = { path = "../wasm-bindgen/crates/web-sys" }
-#js-sys = { path = "../wasm-bindgen/crates/js-sys" }
-#wasm-bindgen = { path = "../wasm-bindgen" }
-
 # These overrides allow our examples to explicitly depend on release crates 
+[patch.crates-io]
 wgpu = { path = "./wgpu" }
 
 [profile.release]

diff --git a/deno_webgpu/Cargo.toml b/deno_webgpu/Cargo.toml
@@ -16,36 +16,37 @@ path = "lib.rs"
 # We make all dependencies conditional on not being wasm,
 # so the whole workspace can built as wasm.
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-deno_core.workspace = true
-serde = { workspace = true, features = ["derive"] }
-tokio = { workspace = true, features = ["full"] }
-wgt = { workspace = true, package = "wgpu-types", features = ["serde"] }
-raw-window-handle = { workspace = true }
-thiserror.workspace = true
-
-[target.'cfg(not(target_arch = "wasm32"))'.dependencies.wgpu-core]
-workspace = true
-features = [
+wgpu-core = { workspace = true, features = [
     "raw-window-handle",
     "trace",
     "replay",
     "serde",
     "strict_asserts",
     "wgsl",
     "gles",
-]
+] }
+wgpu-types = { workspace = true, features = ["serde"] }
+
+deno_core.workspace = true
+raw-window-handle = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
+thiserror.workspace = true
+tokio = { workspace = true, features = ["full"] }
 
-# We want the wgpu-core Metal backend on macOS and iOS.
-[target.'cfg(target_vendor = "apple")'.dependencies.wgpu-core]
-workspace = true
-features = ["metal"]
+# Apple Platforms
+#
+# We want the Metal backend.
+[target.'cfg(target_vendor = "apple")'.dependencies]
+wgpu-core = { workspace = true, features = ["metal"] }
 
-# We want the wgpu-core Direct3D backend on Windows.
-[target.'cfg(windows)'.dependencies.wgpu-core]
-workspace = true
-features = ["dx12"]
+# Windows
+#
+# We want the DX12 backend.
+[target.'cfg(windows)'.dependencies]
+wgpu-core = { workspace = true, features = ["dx12"] }
 
-# We want the wgpu-core Vulkan backend on Unix (but not Emscripten) and Windows.
-[target.'cfg(any(windows, all(unix, not(target_os = "emscripten"))))'.dependencies.wgpu-core]
-workspace = true
-features = ["vulkan"]
+# Windows and Unix (not Emscripten)
+#
+# We want the Vulkan backend.
+[target.'cfg(any(windows, all(unix, not(target_os = "emscripten"))))'.dependencies]
+wgpu-core = { workspace = true, features = ["vulkan"] }
diff --git a/deno_webgpu/binding.rs b/deno_webgpu/binding.rs
@@ -1,7 +1,6 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
 use super::error::WebGpuResult;
-use super::wgpu_types;
 use deno_core::error::AnyError;
 use deno_core::op2;
 use deno_core::OpState;

diff --git a/deno_webgpu/buffer.rs b/deno_webgpu/buffer.rs
@@ -1,7 +1,6 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
 use super::error::WebGpuResult;
-use super::wgpu_types;
 use deno_core::futures::channel::oneshot;
 use deno_core::op2;
 use deno_core::OpState;

diff --git a/deno_webgpu/bundle.rs b/deno_webgpu/bundle.rs
@@ -1,6 +1,5 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
-use super::wgpu_types;
 use deno_core::op2;
 use deno_core::OpState;
 use deno_core::Resource;

diff --git a/deno_webgpu/command_encoder.rs b/deno_webgpu/command_encoder.rs
@@ -1,6 +1,5 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
-use super::wgpu_types;
 use crate::WebGpuQuerySet;
 use deno_core::error::AnyError;
 use deno_core::op2;

diff --git a/deno_webgpu/lib.rs b/deno_webgpu/lib.rs
@@ -12,8 +12,6 @@ use std::borrow::Cow;
 use std::cell::RefCell;
 use std::collections::HashSet;
 use std::rc::Rc;
-pub use wgpu_core;
-pub use wgt as wgpu_types;
 
 use error::WebGpuResult;
 

diff --git a/deno_webgpu/pipeline.rs b/deno_webgpu/pipeline.rs
@@ -1,6 +1,5 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
-use super::wgpu_types;
 use deno_core::error::AnyError;
 use deno_core::op2;
 use deno_core::OpState;

diff --git a/deno_webgpu/queue.rs b/deno_webgpu/queue.rs
@@ -1,6 +1,5 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
-use super::wgpu_types;
 use crate::command_encoder::WebGpuCommandBuffer;
 use crate::Instance;
 use deno_core::error::AnyError;

diff --git a/deno_webgpu/render_pass.rs b/deno_webgpu/render_pass.rs
@@ -1,6 +1,5 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
-use super::wgpu_types;
 use deno_core::op2;
 use deno_core::OpState;
 use deno_core::Resource;

diff --git a/deno_webgpu/sampler.rs b/deno_webgpu/sampler.rs
@@ -1,6 +1,5 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
-use super::wgpu_types;
 use deno_core::op2;
 use deno_core::OpState;
 use deno_core::Resource;

diff --git a/deno_webgpu/shader.rs b/deno_webgpu/shader.rs
@@ -1,6 +1,5 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
-use super::wgpu_types;
 use deno_core::op2;
 use deno_core::OpState;
 use deno_core::Resource;

diff --git a/deno_webgpu/surface.rs b/deno_webgpu/surface.rs
@@ -1,6 +1,5 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
-use super::wgpu_types;
 use super::WebGpuResult;
 use deno_core::op2;
 use deno_core::OpState;

diff --git a/deno_webgpu/texture.rs b/deno_webgpu/texture.rs
@@ -1,6 +1,5 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
-use super::wgpu_types;
 use deno_core::op2;
 use deno_core::OpState;
 use deno_core::Resource;

diff --git a/naga-cli/Cargo.toml b/naga-cli/Cargo.toml
@@ -18,17 +18,7 @@ doc = false
 test = false
 
 [dependencies]
-bincode.workspace = true
-codespan-reporting.workspace = true
-env_logger.workspace = true
-argh.workspace = true
-anyhow.workspace = true
-log.workspace = true
-
-[dependencies.naga]
-version = "24.0.0"
-path = "../naga"
-features = [
+naga = { workspace = true, features = [
     "compact",
     "wgsl-in",
     "wgsl-out",
@@ -41,4 +31,11 @@ features = [
     "dot-out",
     "serialize",
     "deserialize",
-]
+] }
+
+bincode.workspace = true
+codespan-reporting.workspace = true
+env_logger.workspace = true
+argh.workspace = true
+anyhow.workspace = true
+log.workspace = true
diff --git a/player/Cargo.toml b/player/Cargo.toml
@@ -21,17 +21,18 @@ path = "src/bin/play.rs"
 test = false
 
 [dependencies]
+wgpu-types = { workspace = true, features = ["serde"] }
+
 env_logger.workspace = true
 log.workspace = true
 raw-window-handle.workspace = true
 ron.workspace = true
 winit = { workspace = true, optional = true }
 
-[dependencies.wgt]
-workspace = true
-features = ["serde"]
-
-[target.'cfg(not(target_arch = "wasm32"))'.dependencies.wgc]
+# Non-Webassembly
+#
+# We are a non-wasm only crate, and this allows us to compile.
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies.wgpu-core]
 workspace = true
 features = [
     "replay",

diff --git a/player/src/bin/play.rs b/player/src/bin/play.rs
@@ -2,6 +2,9 @@
 
 #[cfg(not(target_arch = "wasm32"))]
 fn main() {
+    extern crate wgpu_core as wgc;
+    extern crate wgpu_types as wgt;
+
     use player::GlobalPlay as _;
     use wgc::device::trace;
 

diff --git a/player/src/lib.rs b/player/src/lib.rs
@@ -3,6 +3,9 @@
 #![cfg(not(target_arch = "wasm32"))]
 #![warn(clippy::allow_attributes, unsafe_op_in_unsafe_fn)]
 
+extern crate wgpu_core as wgc;
+extern crate wgpu_types as wgt;
+
 use wgc::device::trace;
 
 use std::{borrow::Cow, fs, path::Path};

diff --git a/player/tests/test.rs b/player/tests/test.rs
@@ -10,6 +10,9 @@
 
 #![cfg(not(target_arch = "wasm32"))]
 
+extern crate wgpu_core as wgc;
+extern crate wgpu_types as wgt;
+
 use player::GlobalPlay;
 use std::{
     fs::{read_to_string, File},

diff --git a/tests/Cargo.toml b/tests/Cargo.toml
@@ -25,6 +25,9 @@ harness = true
 webgl = ["wgpu/webgl"]
 
 [dependencies]
+wgpu.workspace = true
+wgpu-macros.workspace = true
+
 anyhow.workspace = true
 arrayvec.workspace = true
 approx.workspace = true
@@ -46,20 +49,20 @@ serde_json.workspace = true
 serde.workspace = true
 strum = { workspace = true, features = ["derive"] }
 trybuild.workspace = true
-wgpu.workspace = true
-wgpu-macros.workspace = true
-wgt = { workspace = true, features = ["serde"] }
 
+# Non-Webassembly
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 env_logger.workspace = true
 nv-flip.workspace = true
 parking_lot = { workspace = true, features = ["deadlock_detection"] }
 
+# Webassembly
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 console_log.workspace = true
 wasm-bindgen.workspace = true
 web-sys = { workspace = true }
 
+# Webassembly Dev Dependencies
 [target.'cfg(target_arch = "wasm32")'.dev-dependencies]
 image.workspace = true
 js-sys.workspace = true