Merge branch 'trunk' into ray-tracing-docs

gfx-rs · Dec 16, 2024 · 0a65925 · 0a65925
2 parents 08da9f5 + 2ec87d7
commit 0a65925
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -629,7 +629,7 @@ jobs:
         run: taplo format --check --diff
 
       - name: Check for typos
-        uses: crate-ci/[email protected].2
+        uses: crate-ci/[email protected].3
 
   check-cts-runner:
     # runtime is normally 2 minutes

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/naga/Cargo.toml b/naga/Cargo.toml
@@ -77,7 +77,7 @@ indexmap.workspace = true
 log = "0.4"
 spirv = { version = "0.3", optional = true }
 thiserror.workspace = true
-serde = { version = "1.0.215", features = ["derive"], optional = true }
+serde = { version = "1.0.216", features = ["derive"], optional = true }
 petgraph = { version = "0.6", optional = true }
 pp-rs = { version = "0.2.1", optional = true }
 hexf-parse = { version = "0.2.1", optional = true }