From dba24de0aed36afeca2d8d0e58da21e3541b1921 Mon Sep 17 00:00:00 2001 From: Connor Fitzgerald Date: Mon, 24 Aug 2026 09:45:07 -0400 Subject: [PATCH] Resolve dependencies against the declared MSRV (#10140) --- Cargo.toml | 2 +- naga-cli/Cargo.toml | 7 +------ wgpu-core/platform-deps/apple/Cargo.toml | 2 +- wgpu-core/platform-deps/emscripten/Cargo.toml | 2 +- wgpu-core/platform-deps/linux-android-bsd/Cargo.toml | 2 +- wgpu-core/platform-deps/wasm/Cargo.toml | 2 +- wgpu-core/platform-deps/windows/Cargo.toml | 2 +- 7 files changed, 7 insertions(+), 12 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 7d9c57737..7ae16fb06 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace] -resolver = "2" +resolver = "3" members = [ "cts_runner", "deno_webgpu", diff --git a/naga-cli/Cargo.toml b/naga-cli/Cargo.toml index dcc0722a8..395c9b915 100644 --- a/naga-cli/Cargo.toml +++ b/naga-cli/Cargo.toml @@ -6,12 +6,7 @@ description = "CLI for the naga shader translator and validator. Part of the wgp repository.workspace = true keywords = ["shader", "SPIR-V", "GLSL", "MSL"] 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 -# them to have less restrictive MSRVs individually than the workspace as a -# whole, if their code permits. See `../README.md` for details. -rust-version = "1.76" +rust-version.workspace = true [[bin]] name = "naga" diff --git a/wgpu-core/platform-deps/apple/Cargo.toml b/wgpu-core/platform-deps/apple/Cargo.toml index 6baf2acda..b9fb691bb 100644 --- a/wgpu-core/platform-deps/apple/Cargo.toml +++ b/wgpu-core/platform-deps/apple/Cargo.toml @@ -13,7 +13,7 @@ readme = "README.md" # copy the crates it actually uses out of the workspace, so it's meaningful for # them to have less restrictive MSRVs individually than the workspace as a # whole, if their code permits. See `../README.md` for details. -rust-version = "1.76" +rust-version = "1.87" [features] metal = ["wgpu-hal/metal"] diff --git a/wgpu-core/platform-deps/emscripten/Cargo.toml b/wgpu-core/platform-deps/emscripten/Cargo.toml index b5dd20c76..2ead5c6c1 100644 --- a/wgpu-core/platform-deps/emscripten/Cargo.toml +++ b/wgpu-core/platform-deps/emscripten/Cargo.toml @@ -13,7 +13,7 @@ readme = "README.md" # copy the crates it actually uses out of the workspace, so it's meaningful for # them to have less restrictive MSRVs individually than the workspace as a # whole, if their code permits. See `../README.md` for details. -rust-version = "1.76" +rust-version = "1.87" [features] gles = ["wgpu-hal/gles"] diff --git a/wgpu-core/platform-deps/linux-android-bsd/Cargo.toml b/wgpu-core/platform-deps/linux-android-bsd/Cargo.toml index 2abde2ace..ffc09c4b0 100644 --- a/wgpu-core/platform-deps/linux-android-bsd/Cargo.toml +++ b/wgpu-core/platform-deps/linux-android-bsd/Cargo.toml @@ -13,7 +13,7 @@ readme = "README.md" # copy the crates it actually uses out of the workspace, so it's meaningful for # them to have less restrictive MSRVs individually than the workspace as a # whole, if their code permits. See `../README.md` for details. -rust-version = "1.76" +rust-version = "1.87" [features] gles = ["wgpu-hal/gles"] diff --git a/wgpu-core/platform-deps/wasm/Cargo.toml b/wgpu-core/platform-deps/wasm/Cargo.toml index 861177e0f..bcce17566 100644 --- a/wgpu-core/platform-deps/wasm/Cargo.toml +++ b/wgpu-core/platform-deps/wasm/Cargo.toml @@ -13,7 +13,7 @@ readme = "README.md" # copy the crates it actually uses out of the workspace, so it's meaningful for # them to have less restrictive MSRVs individually than the workspace as a # whole, if their code permits. See `../README.md` for details. -rust-version = "1.76" +rust-version = "1.87" [features] webgl = ["wgpu-hal/gles"] diff --git a/wgpu-core/platform-deps/windows/Cargo.toml b/wgpu-core/platform-deps/windows/Cargo.toml index be386a40f..c72b8bf08 100644 --- a/wgpu-core/platform-deps/windows/Cargo.toml +++ b/wgpu-core/platform-deps/windows/Cargo.toml @@ -13,7 +13,7 @@ readme = "README.md" # copy the crates it actually uses out of the workspace, so it's meaningful for # them to have less restrictive MSRVs individually than the workspace as a # whole, if their code permits. See `../README.md` for details. -rust-version = "1.76" +rust-version = "1.87" [features] gles = ["wgpu-hal/gles"]