Merge commit '5436dba826191964ac1d0dab534b7eb6d4c878f6' into clippyup

2 files changed, 2 insertions, 3 deletions

diff --git a/src/driver.rs b/src/driver.rs
index ee17feed77a..1d89477dcc1 100644
--- a/src/driver.rs
+++ b/src/driver.rs
@@ -192,7 +192,7 @@ You can use tool lints to allow or deny lints from your code, eg.:
     );
 }
 
-const BUG_REPORT_URL: &str = "https://github.com/rust-lang/rust-clippy/issues/new";
+const BUG_REPORT_URL: &str = "https://github.com/rust-lang/rust-clippy/issues/new?template=ice.yml";
 
 #[allow(clippy::too_many_lines)]
 pub fn main() {
diff --git a/src/main.rs b/src/main.rs
index cdc85cb33ca..26b655076cf 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -132,8 +132,7 @@ impl ClippyCmd {
         let clippy_args: String = self
             .clippy_args
             .iter()
-            .map(|arg| format!("{arg}__CLIPPY_HACKERY__"))
-            .collect();
+            .fold(String::new(), |s, arg| s + arg + "__CLIPPY_HACKERY__");
 
         // Currently, `CLIPPY_TERMINAL_WIDTH` is used only to format "unknown field" error messages.
         let terminal_width = termize::dimensions().map_or(0, |(w, _)| w);