ci: simplify clippy

.github/workflows/ci.yaml

@@ -222,7 +222,9 @@ jobs:
         run: |
           RUSTDOCFLAGS=-Dwarnings cargo +stable doc --no-deps -p spirv-std
           RUSTDOCFLAGS=-Dwarnings cargo +stable doc --no-deps -p spirv-builder --no-default-features
-      - name: Clippy & custom lints
+      - name: cargo clippy
+        run: cargo clippy --all-targets -- -D warnings
+      - name: custom lints
         run: .github/workflows/lint.sh
 
   cargo-deny:

.github/workflows/lint.sh

@@ -1,57 +1,6 @@
 #!/usr/bin/env bash
 set -e
 
-if [[ -z "${CI}" ]]; then
-    FEAT="use-compiled-tools"
-else
-    FEAT="use-installed-tools"
-fi
-
-function clippy() {
-    echo ::group::"$1"
-    cargo clippy \
-        --manifest-path "$1/Cargo.toml" \
-        --no-default-features \
-        --features "$FEAT" \
-        --all-targets \
-        -- -D warnings
-    echo ::endgroup::
-}
-
-function clippy_no_features() {
-    echo ::group::"$1"
-    cargo clippy \
-        --manifest-path "$1/Cargo.toml" \
-        --all-targets \
-        -- -D warnings
-    echo ::endgroup::
-}
-
-# Core crates
-clippy_no_features crates/rustc_codegen_spirv-target-specs
-clippy_no_features crates/rustc_codegen_spirv-types
-clippy crates/rustc_codegen_spirv
-clippy crates/spirv-builder
-clippy_no_features crates/spirv-std
-
-# Examples
-clippy examples/multibuilder
-clippy examples/runners/ash
-clippy_no_features examples/runners/cpu
-clippy examples/runners/wgpu
-
-# shaders
-clippy_no_features examples/shaders/sky-shader
-clippy_no_features examples/shaders/simplest-shader
-clippy_no_features examples/shaders/compute-shader
-clippy_no_features examples/shaders/mouse-shader
-clippy_no_features examples/shaders/reduce
-
-# tests
-clippy tests/compiletests
-clippy tests/difftests/bin
-clippy tests/difftests/lib
-
 # Custom lints
 
 # 1. Disallow `std::env` (mis)use from `rustc_codegen_spirv`
@@ -111,6 +60,11 @@ version_test crates/spirv-std
 # HACK(eddyb) see `crates/rustc_codegen_spirv/build.rs` for more on `pqp_cg_ssa`
 # (a patched copy of `rustc_codegen_ssa`).
 echo ::group::rustc_codegen_spirv_disable_pqp_cg_ssa
+if [[ -z "${CI}" ]]; then
+    FEAT="use-compiled-tools"
+else
+    FEAT="use-installed-tools"
+fi
 cargo clippy \
     --manifest-path "crates/rustc_codegen_spirv/Cargo.toml" \
     --no-default-features \

Cargo.toml

@@ -85,3 +85,6 @@ codegen-units = 256
 #
 # rustflags = ["-Zshare-generics=off"]
 codegen-units = 1
+
+[patch.crates-io]
+spirv-tools = { git = "https://github.com/Rust-GPU/spirv-tools-rs", rev = "a77b217f48d852a8d87183b3fa89396bf4db58bc" }