From d57303ace77ea9751b522f71a15a666a57104279 Mon Sep 17 00:00:00 2001
From: Karol Herbst <git@karolherbst.de>
Date: Thu, 8 Jun 2023 13:40:03 +0200
Subject: [PATCH] ci: add and use clippy for rusticl

Acked-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Karol Herbst <git@karolherbst.de>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23522>
---
 .gitlab-ci/build/gitlab-ci.yml     | 1 +
 .gitlab-ci/container/build-rust.sh | 2 +-
 .gitlab-ci/image-tags.yml          | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml
index 2380291bea7..d7102035bb2 100644
--- a/.gitlab-ci/build/gitlab-ci.yml
+++ b/.gitlab-ci/build/gitlab-ci.yml
@@ -604,6 +604,7 @@ debian-rusticl:
       -D gallium-nine=false
       -D gallium-opencl=disabled
       -D gallium-rusticl=true
+    RUSTC: clippy-driver
 
 debian-vulkan:
   extends: .meson-build
diff --git a/.gitlab-ci/container/build-rust.sh b/.gitlab-ci/container/build-rust.sh
index 8abdc95cee0..6cc8536300d 100644
--- a/.gitlab-ci/container/build-rust.sh
+++ b/.gitlab-ci/container/build-rust.sh
@@ -26,7 +26,7 @@ curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
       --profile minimal \
       -y
 
-rustup component add rustfmt
+rustup component add clippy rustfmt
 
 # Set up a config script for cross compiling -- cargo needs your system cc for
 # linking in cross builds, but doesn't know what you want to use for system cc.
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index b1871d99685..0e91c04b73b 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -1,6 +1,6 @@
 variables:
    DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base"
-   DEBIAN_BASE_TAG: "2023-06-07-rust-bump"
+   DEBIAN_BASE_TAG: "2023-06-08-rust-clippy"
 
    DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
    DEBIAN_BUILD_TAG: "2023-05-25-bookworm"