Refactor Cargo.toml Significantly #6980

cwfitzgerald · 2025-01-23T19:18:03Z

Sorry this bad boy got a bit out of control, but I think puts us in a much better place than we were before.

Step 1 towards #6975

Replaces Cargo.toml crate renames with extern crate renames at the top of the relevant libraries.
Vastly cleans up the target-soup in wgpu/Cargo.toml and wgpu-hal/Cargo.toml and adds a variety of comments.
Stop using separate tables for each dependency.
Stop using wgt in examples and tests.
Always put local dependencies on top.

cwfitzgerald · 2025-01-23T21:04:28Z

.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


Not strictly necessary, but I thought I had a cache bug, and it doesn't hurt to make sure the caches are clear every once and again

cwfitzgerald · 2025-01-23T21:06:47Z

player/tests/test.rs

+extern crate wgpu_core as wgc;
+extern crate wgpu_types as wgt;


cwfitzgerald · 2025-01-23T21:07:21Z

tests/src/expectations.rs

@@ -35,7 +35,7 @@ use core::fmt;
 ///
 /// [skip]: super::TestParameters::skip
 /// [expect_fail]: super::TestParameters::expect_fail
-/// [`AdapterInfo`]: wgt::AdapterInfo
+/// [`AdapterInfo`]: wgpu::AdapterInfo


We constantly used wgt in tests when we shouldn't have.

cwfitzgerald · 2025-01-23T21:08:15Z

wgpu-hal/Cargo.toml

+[lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(web_sys_unstable_apis)'] }
+


Moved all the lints to be in the same order

cwfitzgerald · 2025-01-23T21:08:39Z

wgpu-hal/examples/halmark/main.rs

@@ -68,7 +68,7 @@ struct Example<A: hal::Api> {
    instance: A::Instance,
    adapter: A::Adapter,
    surface: A::Surface,
-    surface_format: wgt::TextureFormat,
+    surface_format: wgpu_types::TextureFormat,


Changed these because these are supposed to be examples.

cwfitzgerald · 2025-01-23T21:09:24Z

wgpu/Cargo.toml

+spirv = ["naga/spv-in", "wgpu-core?/spirv"]

 ## Enable accepting GLSL shaders as input.
-glsl = ["naga/glsl-in", "wgc/glsl"]
+glsl = ["naga/glsl-in", "wgpu-core?/glsl"]


subtle: we dropped a ? here, and previously would always get wgpu-core even if webgl wasn't enabled.

cwfitzgerald · 2025-01-23T21:10:54Z

wgpu/Cargo.toml

+########################################
+# Target Specific Feature Dependencies #
+########################################


This section was recast such that instead of trying to get exact right combination of targets for each feature, we just list out the target categories and list out each feature. This is soooo much more clear.

cwfitzgerald · 2025-01-23T21:11:18Z

wgpu/src/util/mod.rs

-    #[cfg_attr(docsrs, doc(cfg(any(wgpu_core, naga))))]
-    #[cfg(any(wgpu_core, naga))]


This was wrong, but wasn't caught until some of the cfgs were fixed up.

jimblandy · 2025-01-23T22:14:30Z

@cwfitzgerald Does this change the names of the wgpu features people need to select to get, say wgpu_core?
It seems like the way it was written before, it'd need to be "wgc", but now it's "wgpu_core", no?

If so, then we need a CHANGELOG.md note about this.

jimblandy

Everything outside of deno_webgpu looks good to me, except as noted. The wgpu_hal/Cargo.toml changes are especially nice.

deno_webgpu/Cargo.toml

wgpu/Cargo.toml

cwfitzgerald requested review from a team and crowlKats as code owners January 23, 2025 19:18

cwfitzgerald force-pushed the cw/cargo-toml-refactor branch 6 times, most recently from 6dca5bb to 3240917 Compare January 23, 2025 20:21

cwfitzgerald mentioned this pull request Jan 23, 2025

CI/xtask for Validating State of Dependency Tree #6981

Open

cwfitzgerald force-pushed the cw/cargo-toml-refactor branch from 3240917 to bc98515 Compare January 23, 2025 20:28

cwfitzgerald commented Jan 23, 2025

View reviewed changes

Refactor Cargo.toml Signifigantly

243968f

cwfitzgerald commented Jan 23, 2025

View reviewed changes

Undo My Sins

184c51d

cwfitzgerald force-pushed the cw/cargo-toml-refactor branch from bc98515 to 184c51d Compare January 23, 2025 21:16

ErichDonGubler changed the title ~~Refactor Cargo.toml Signifigantly~~ Refactor Cargo.toml Significantly Jan 23, 2025

jimblandy approved these changes Jan 23, 2025

View reviewed changes

deno_webgpu/Cargo.toml Outdated Show resolved Hide resolved

wgpu/Cargo.toml Show resolved Hide resolved

wgpu/Cargo.toml Outdated Show resolved Hide resolved

Comments

cdab1e9

cwfitzgerald enabled auto-merge (squash) January 23, 2025 22:40

cwfitzgerald merged commit d8e7ab1 into gfx-rs:trunk Jan 23, 2025
31 checks passed

This was referenced Jan 23, 2025

Make all backends controlled by features (using a very ugly workaround) #6949

Draft

Reintroduce workspace inheritance #3407

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactor Cargo.toml Significantly #6980

Refactor Cargo.toml Significantly #6980

cwfitzgerald commented Jan 23, 2025 •

edited

Loading

cwfitzgerald Jan 23, 2025

cwfitzgerald Jan 23, 2025

cwfitzgerald Jan 23, 2025

cwfitzgerald Jan 23, 2025

cwfitzgerald Jan 23, 2025

cwfitzgerald Jan 23, 2025

cwfitzgerald Jan 23, 2025

cwfitzgerald Jan 23, 2025

jimblandy commented Jan 23, 2025 •

edited

Loading

jimblandy left a comment

		extern crate wgpu_core as wgc;
		extern crate wgpu_types as wgt;

		[lints.rust]
		unexpected_cfgs = { level = "warn", check-cfg = ['cfg(web_sys_unstable_apis)'] }

		#[cfg_attr(docsrs, doc(cfg(any(wgpu_core, naga))))]
		#[cfg(any(wgpu_core, naga))]

Refactor Cargo.toml Significantly #6980

Refactor Cargo.toml Significantly #6980

Conversation

cwfitzgerald commented Jan 23, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jimblandy commented Jan 23, 2025 • edited Loading

jimblandy left a comment

Choose a reason for hiding this comment

cwfitzgerald commented Jan 23, 2025 •

edited

Loading

jimblandy commented Jan 23, 2025 •

edited

Loading