From 45d8f425130870db48fdf986fdc59e5a4cf4af0e Mon Sep 17 00:00:00 2001 From: Connor Fitzgerald Date: Thu, 10 Apr 2025 19:57:10 -0400 Subject: [PATCH] Use workspace package information everywhere --- Cargo.lock | 6 +++--- cts_runner/Cargo.toml | 2 +- naga-cli/Cargo.toml | 10 +++++----- naga/Cargo.toml | 11 +++++------ naga/fuzz/Cargo.toml | 8 ++++---- naga/hlsl-snapshots/Cargo.toml | 6 +++--- wgpu-core/Cargo.toml | 14 +++++++------- wgpu-hal/Cargo.toml | 14 +++++++------- wgpu-types/Cargo.toml | 14 +++++++------- 9 files changed, 42 insertions(+), 43 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0bbefa43c..1c708ef48 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -946,7 +946,7 @@ dependencies = [ [[package]] name = "cts_runner" -version = "0.1.0" +version = "25.0.0" dependencies = [ "deno_console", "deno_core", @@ -1844,7 +1844,7 @@ checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" [[package]] name = "hlsl-snapshots" -version = "0.1.0" +version = "25.0.0" dependencies = [ "anyhow", "nanoserde", @@ -2448,7 +2448,7 @@ dependencies = [ [[package]] name = "naga-fuzz" -version = "0.0.0" +version = "25.0.0" dependencies = [ "arbitrary", "cfg_aliases 0.2.1", diff --git a/cts_runner/Cargo.toml b/cts_runner/Cargo.toml index 0d651d17a..715172f6e 100644 --- a/cts_runner/Cargo.toml +++ b/cts_runner/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cts_runner" -version = "0.1.0" +version.workspace = true authors = ["Luca Casonato "] edition.workspace = true description = "CTS runner for wgpu" diff --git a/naga-cli/Cargo.toml b/naga-cli/Cargo.toml index cf4b08500..f044b771a 100644 --- a/naga-cli/Cargo.toml +++ b/naga-cli/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "naga-cli" -version = "25.0.0" -authors = ["gfx-rs developers"] -edition = "2021" +version.workspace = true +authors.workspace = true +edition.workspace = true description = "CLI for the naga shader translator and validator. Part of the wgpu project" -repository = "https://github.com/gfx-rs/wgpu/tree/trunk/naga-cli" +repository.workspace = true keywords = ["shader", "SPIR-V", "GLSL", "MSL"] -license = "MIT OR Apache-2.0" +license.workspace = true # Override the workspace's `rust-version` key. Firefox uses `cargo vendor` to # copy the crates it actually uses out of the workspace, so it's meaningful for diff --git a/naga/Cargo.toml b/naga/Cargo.toml index 136357578..bc2e746c2 100644 --- a/naga/Cargo.toml +++ b/naga/Cargo.toml @@ -1,14 +1,13 @@ [package] name = "naga" -version = "25.0.0" -authors = ["gfx-rs developers"] -edition = "2021" +version.workspace = true +authors.workspace = true +edition.workspace = true description = "Shader translator and validator. Part of the wgpu project" -repository = "https://github.com/gfx-rs/wgpu/tree/trunk/naga" +repository.workspace = true keywords = ["shader", "SPIR-V", "GLSL", "MSL"] -license = "MIT OR Apache-2.0" +license.workspace = true exclude = ["bin/**/*", "tests/**/*", "Cargo.lock", "target/**/*"] -resolver = "2" # Override the workspace's `rust-version` key. Firefox uses `cargo vendor` to # copy the crates it actually uses out of the workspace, so it's meaningful for diff --git a/naga/fuzz/Cargo.toml b/naga/fuzz/Cargo.toml index 48a195888..d56889070 100644 --- a/naga/fuzz/Cargo.toml +++ b/naga/fuzz/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "naga-fuzz" -version = "0.0.0" -authors = ["Automatically generated"] +version.workspace = true +authors.workspace = true publish = false -edition = "2018" -license = "MIT OR Apache-2.0" +edition.workspace = true +license.workspace = true build = "build.rs" [package.metadata] diff --git a/naga/hlsl-snapshots/Cargo.toml b/naga/hlsl-snapshots/Cargo.toml index 2bcc4f9ce..6abcab0bf 100644 --- a/naga/hlsl-snapshots/Cargo.toml +++ b/naga/hlsl-snapshots/Cargo.toml @@ -1,9 +1,9 @@ [package] name = "hlsl-snapshots" -version = "0.1.0" -edition = "2021" +version.workspace = true +edition.workspace = true publish = false -license = "MIT OR Apache-2.0" +license.workspace = true [lib] name = "hlsl_snapshots" diff --git a/wgpu-core/Cargo.toml b/wgpu-core/Cargo.toml index 947a674ed..fedec7bff 100644 --- a/wgpu-core/Cargo.toml +++ b/wgpu-core/Cargo.toml @@ -1,13 +1,13 @@ [package] name = "wgpu-core" -version = "25.0.0" -authors = ["gfx-rs developers"] -edition = "2021" +version.workspace = true +authors.workspace = true +edition.workspace = true description = "Core implementation logic of wgpu, the cross-platform, safe, pure-rust graphics API" -homepage = "https://wgpu.rs/" -repository = "https://github.com/gfx-rs/wgpu" -keywords = ["graphics"] -license = "MIT OR Apache-2.0" +homepage.workspace = true +repository.workspace = true +keywords.workspace = true +license.workspace = true # Override the workspace's `rust-version` key. Firefox uses `cargo vendor` to # copy the crates it actually uses out of the workspace, so it's meaningful for diff --git a/wgpu-hal/Cargo.toml b/wgpu-hal/Cargo.toml index c36244050..9d76061d4 100644 --- a/wgpu-hal/Cargo.toml +++ b/wgpu-hal/Cargo.toml @@ -1,13 +1,13 @@ [package] name = "wgpu-hal" -version = "25.0.0" -authors = ["gfx-rs developers"] -edition = "2021" +version.workspace = true +authors.workspace = true +edition.workspace = true description = "Hardware abstraction layer for wgpu, the cross-platform, safe, pure-rust graphics API" -homepage = "https://wgpu.rs/" -repository = "https://github.com/gfx-rs/wgpu" -keywords = ["graphics"] -license = "MIT OR Apache-2.0" +homepage.workspace = true +repository.workspace = true +keywords.workspace = true +license.workspace = true # Override the workspace's `rust-version` key. Firefox uses `cargo vendor` to # copy the crates it actually uses out of the workspace, so it's meaningful for diff --git a/wgpu-types/Cargo.toml b/wgpu-types/Cargo.toml index 6b79ea0f0..9715538da 100644 --- a/wgpu-types/Cargo.toml +++ b/wgpu-types/Cargo.toml @@ -1,13 +1,13 @@ [package] name = "wgpu-types" -version = "25.0.0" -authors = ["gfx-rs developers"] -edition = "2021" +version.workspace = true +authors.workspace = true +edition.workspace = true description = "Common types and utilities for wgpu, the cross-platform, safe, pure-rust graphics API" -homepage = "https://wgpu.rs/" -repository = "https://github.com/gfx-rs/wgpu" -keywords = ["graphics"] -license = "MIT OR Apache-2.0" +homepage.workspace = true +repository.workspace = true +keywords.workspace = true +license.workspace = true # Override the workspace's `rust-version` key. Firefox uses `cargo vendor` to # copy the crates it actually uses out of the workspace, so it's meaningful for