From b4bcb1a567d21290438e43b48ebec3cf17de4f7a Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Wed, 12 Jul 2023 15:43:44 +0100
Subject: [PATCH] ci/lint: also print a diff for rust format issues

Signed-off-by: Eric Engestrom <eric@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24257>
---
 .gitlab-ci/test/gitlab-ci.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml
index 2bbed4b1b85..9b55107a5f7 100644
--- a/.gitlab-ci/test/gitlab-ci.yml
+++ b/.gitlab-ci/test/gitlab-ci.yml
@@ -25,14 +25,16 @@
     - .use-debian/x86_64_build
   variables:
     GIT_STRATEGY: fetch
+  script:
+    - git diff --color=always --exit-code  # Fails if there are diffs
 
 rustfmt:
   extends:
     - .formatting-check
     - .lint-rustfmt-rules
-  script:
+  before_script:
     - shopt -s globstar
-    - rustfmt --check --verbose src/**/lib.rs
+    - rustfmt --verbose src/**/lib.rs
 
 clang-format:
   extends:
@@ -40,13 +42,12 @@ clang-format:
     - .lint-clang-format-rules
   variables:
     LLVM_VERSION: 15
-  script:
+  before_script:
     - shopt -s globstar
     # We need a meson build dir, but its config doesn't actually matter, so
     # let's just use the default.
     - meson setup build
     - ninja -C build clang-format
-    - git diff --color=always --exit-code  # Fails if there are diffs
 
 .test-gl:
   extends: