Auto merge of #2288 - RalfJung:clippy, r=RalfJung

add ./miri clippy

also make ui_test comply with clippy

.github/workflows/ci.yml

@@ -98,12 +98,8 @@ jobs:
           ./rustup-toolchain "" -c clippy
       - name: rustfmt
         run: ./miri fmt --check
-      - name: clippy (miri)
-        run: cargo clippy --all-targets -- -D warnings
-      #- name: Clippy (ui_test)
-      #  run: cargo clippy --manifest-path ui_test/Cargo.toml --all-targets -- -D warnings
-      - name: clippy (cargo-miri)
-        run: cargo clippy --manifest-path cargo-miri/Cargo.toml --all-targets -- -D warnings
+      - name: clippy
+        run: ./miri clippy -- -D warnings
       - name: rustdoc
         run: RUSTDOCFLAGS="-Dwarnings" cargo doc --document-private-items
 

miri

@@ -28,6 +28,9 @@ times and slower execution times.
 ./miri fmt <flags>:
 Format all sources and tests.  <flags> are passed to `rustfmt`.
 
+./miri clippy <flags>:
+Format all sources and tests.  <flags> are passed to `cargo clippy`.
+
   ENVIRONMENT VARIABLES
 
 MIRI_SYSROOT:
@@ -163,6 +166,11 @@ fmt)
     find "$MIRIDIR" -not \( -name target -prune \) -name '*.rs' \
         | xargs rustfmt --edition=2021 --config-path "$MIRIDIR/rustfmt.toml" "$@"
     ;;
+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"/cargo-miri/Cargo.toml "$@"
+    ;;
 *)
     if [ -n "$COMMAND" ]; then
       echo "Unknown command: $COMMAND"

rustup-toolchain

@@ -42,7 +42,7 @@ fi
 
 # Install and setup new toolchain.
 rustup toolchain uninstall miri
-rustup-toolchain-install-master -n miri -c cargo -c rust-src -c rustc-dev -c llvm-tools -c rustfmt "$@" -- "$NEW_COMMIT"
+rustup-toolchain-install-master -n miri -c cargo -c rust-src -c rustc-dev -c llvm-tools -c rustfmt -c clippy "$@" -- "$NEW_COMMIT"
 rustup override set miri
 
 # Cleanup.

ui_test/src/comments.rs

@@ -90,7 +90,7 @@ pub(crate) fn parse(path: &Path, content: &str) -> Self {
                     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

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

ui_test/src/rustc_stderr.rs

@@ -117,16 +117,16 @@ fn line(&self, file: &Path) -> Option<usize> {
 
 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!(

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![