From e33efc75171ca48dfcd30984dfc356cdbfc5c1e4 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Wed, 29 Jun 2022 18:17:28 -0400
Subject: [PATCH] make ui_test pass clippy

---
 miri                        | 2 +-
 ui_test/src/comments.rs     | 2 +-
 ui_test/src/lib.rs          | 8 +++++---
 ui_test/src/rustc_stderr.rs | 6 +++---
 ui_test/src/tests.rs        | 2 +-
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/miri b/miri
index 4dd34e0ef6c5..6b7e9dbf03f8 100755
--- a/miri
+++ b/miri
@@ -168,7 +168,7 @@ fmt)
     ;;
 clippy)
     cargo clippy $CARGO_BUILD_FLAGS --manifest-path "$MIRIDIR"/Cargo.toml --all-targets "$@"
-    #cargo clippy $CARGO_BUILD_FLAGS --manifest-path "$MIRIDIR"/ui_test/Cargo.toml --all-targets "$@"
+    cargo clippy $CARGO_BUILD_FLAGS --manifest-path "$MIRIDIR"/ui_test/Cargo.toml --all-targets "$@"
     cargo clippy $CARGO_BUILD_FLAGS --manifest-path "$MIRIDIR"/cargo-miri/Cargo.toml "$@"
     ;;
 *)
diff --git a/ui_test/src/comments.rs b/ui_test/src/comments.rs
index 43c687e9c9a5..e7b4968a9ca6 100644
--- a/ui_test/src/comments.rs
+++ b/ui_test/src/comments.rs
@@ -90,7 +90,7 @@ impl Comments {
                     path.display()
                 );
                 this.revisions =
-                    Some(revisions.trim().split_whitespace().map(|s| s.to_string()).collect());
+                    Some(revisions.split_whitespace().map(|s| s.to_string()).collect());
             }
             if let Some(s) = line.strip_prefix("// ignore-") {
                 let s = s
diff --git a/ui_test/src/lib.rs b/ui_test/src/lib.rs
index 30e1296f7b39..ff0c4e1c8996 100644
--- a/ui_test/src/lib.rs
+++ b/ui_test/src/lib.rs
@@ -1,3 +1,5 @@
+#![allow(clippy::enum_variant_names, clippy::useless_format, clippy::too_many_arguments)]
+
 use std::collections::VecDeque;
 use std::fmt::Write;
 use std::path::{Path, PathBuf};
@@ -338,17 +340,17 @@ fn check_test_result(
         revised("stderr"),
         target,
         &config.stderr_filters,
-        &config,
+        config,
         comments,
     );
     check_output(
-        &stdout,
+        stdout,
         path,
         errors,
         revised("stdout"),
         target,
         &config.stdout_filters,
-        &config,
+        config,
         comments,
     );
     // Check error annotations in the source against output
diff --git a/ui_test/src/rustc_stderr.rs b/ui_test/src/rustc_stderr.rs
index 2d3845752e9a..ea32ce4bd293 100644
--- a/ui_test/src/rustc_stderr.rs
+++ b/ui_test/src/rustc_stderr.rs
@@ -117,16 +117,16 @@ impl Span {
 
 pub(crate) fn filter_annotations_from_rendered(rendered: &str) -> std::borrow::Cow<'_, str> {
     let annotations = Regex::new(r"\s*//(\[[^\]]\])?~.*").unwrap();
-    annotations.replace_all(&rendered, "")
+    annotations.replace_all(rendered, "")
 }
 
 pub(crate) fn process(file: &Path, stderr: &[u8]) -> Diagnostics {
-    let stderr = std::str::from_utf8(&stderr).unwrap();
+    let stderr = std::str::from_utf8(stderr).unwrap();
     let mut rendered = String::new();
     let mut messages = vec![];
     let mut messages_from_unknown_file_or_line = vec![];
     for line in stderr.lines() {
-        if line.starts_with("{") {
+        if line.starts_with('{') {
             match serde_json::from_str::<RustcMessage>(line) {
                 Ok(msg) => {
                     write!(
diff --git a/ui_test/src/tests.rs b/ui_test/src/tests.rs
index 7e08a68be7b9..a45f8f8933c9 100644
--- a/ui_test/src/tests.rs
+++ b/ui_test/src/tests.rs
@@ -29,7 +29,7 @@ fn main() {
 }
     ";
     let path = Path::new("$DIR/<dummy>");
-    let comments = Comments::parse(&path, s);
+    let comments = Comments::parse(path, s);
     let mut errors = vec![];
     let config = config();
     let messages = vec![