From c80333edfb584e054b7ac337cca6d98f59c507ba Mon Sep 17 00:00:00 2001
From: Nilstrieb <48135649+Nilstrieb@users.noreply.github.com>
Date: Fri, 7 Jul 2023 19:06:47 +0200
Subject: [PATCH 1/2] Fail the build if clippy tests don't pass

This was removed in
https://github.com/rust-lang/rust/pull/113260/commits/de69d556eb5006a21f868b8c12d48f0ef1308a5a#diff-8479eab02701e686aedb15b567dc8fc31220c6e4efb9565ccc9d662b7fee2214
which caused CI to ignore clippy failures. This adds back the exit,
which should cause CI to fail again if a test is broken (like right
now, as clippy tests are broken on master).
---
 src/bootstrap/test.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index e4cc88c64a5..eed7a584b60 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -799,6 +799,10 @@ impl Step for Clippy {
             // The tests succeeded; nothing to do.
             return;
         }
+
+        if !builder.config.cmd.bless() {
+            crate::detail_exit_macro!(1);
+        }
     }
 }
 

From d8c29b82c9732087881da93a429431e5f2da346d Mon Sep 17 00:00:00 2001
From: Nilstrieb <48135649+Nilstrieb@users.noreply.github.com>
Date: Sat, 8 Jul 2023 17:17:40 +0200
Subject: [PATCH 2/2] Delete `to_string_in_format_args_incremental.rs`

It fails CI and passes locally. It passes random directores in
`-Cincremental` so maybe something's up. It shouldn't block us here.
---
 .../tests/ui/to_string_in_format_args_incremental.rs   |  9 ---------
 .../ui/to_string_in_format_args_incremental.stderr     | 10 ----------
 2 files changed, 19 deletions(-)
 delete mode 100644 src/tools/clippy/tests/ui/to_string_in_format_args_incremental.rs
 delete mode 100644 src/tools/clippy/tests/ui/to_string_in_format_args_incremental.stderr

diff --git a/src/tools/clippy/tests/ui/to_string_in_format_args_incremental.rs b/src/tools/clippy/tests/ui/to_string_in_format_args_incremental.rs
deleted file mode 100644
index 67115f7c5a7..00000000000
--- a/src/tools/clippy/tests/ui/to_string_in_format_args_incremental.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-//@run-rustfix
-//@compile-flags: -C incremental=target/debug/test/incr
-
-// see https://github.com/rust-lang/rust-clippy/issues/10969
-
-fn main() {
-    let s = "Hello, world!";
-    println!("{}", s.to_string());
-}
diff --git a/src/tools/clippy/tests/ui/to_string_in_format_args_incremental.stderr b/src/tools/clippy/tests/ui/to_string_in_format_args_incremental.stderr
deleted file mode 100644
index a992c542914..00000000000
--- a/src/tools/clippy/tests/ui/to_string_in_format_args_incremental.stderr
+++ /dev/null
@@ -1,10 +0,0 @@
-error: `to_string` applied to a type that implements `Display` in `println!` args
-  --> $DIR/to_string_in_format_args_incremental.rs:8:21
-   |
-LL |     println!("{}", s.to_string());
-   |                     ^^^^^^^^^^^^ help: remove this
-   |
-   = note: `-D clippy::to-string-in-format-args` implied by `-D warnings`
-
-error: aborting due to previous error
-