Merge branch 'trunk' into remove-rt-undefined-behavior

gfx-rs · Dec 17, 2024 · cb48e2c · cb48e2c
2 parents cc97ba7 + 8f2f5e9
commit cb48e2c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -34,7 +34,7 @@ env:
   # We sometimes need nightly to use special things in CI.
   #
   # In order to prevent CI regressions, we pin the nightly version.
-  NIGHTLY_VERSION: "nightly-2023-12-17"
+  NIGHTLY_VERSION: "nightly-2024-10-10"
   # This is the MSRV used by `wgpu` itself and all surrounding infrastructure.
   REPO_MSRV: "1.83"
   # This is the MSRV used by the `wgpu-core`, `wgpu-hal`, and `wgpu-types` crates,

diff --git a/Cargo.toml b/Cargo.toml
@@ -42,6 +42,7 @@ default-members = [
 
 [workspace.lints.clippy]
 manual_c_str_literals = "allow"
+ref_as_ptr = "warn"
 
 [workspace.package]
 edition = "2021"

diff --git a/naga/xtask/src/validate.rs b/naga/xtask/src/validate.rs
@@ -159,7 +159,7 @@ fn collect_validation_jobs(jobs: &mut Vec<Job>, cmd: ValidateSubcommand) -> anyh
                     // that to Windows as well.
                     ValidateSubcommand::Hlsl(
                         ValidateHlslCommand::Dxc | ValidateHlslCommand::Fxc,
-                    ) => cfg!(os = "windows"),
+                    ) => cfg!(target_os = "windows"),
                     ValidateSubcommand::All => continue,
                 };
                 if should_validate {