From 0ba4cdb712e64c624abe931b1e750c7e00c40161 Mon Sep 17 00:00:00 2001
From: Oli Scherer <git-spam-no-reply9815368754983@oli-obk.de>
Date: Tue, 27 Jun 2023 08:08:34 +0000
Subject: [PATCH] Make `--quiet` actually do something

---
 src/tools/miri/Cargo.lock           |  4 ++--
 src/tools/miri/Cargo.toml           |  2 +-
 src/tools/miri/tests/compiletest.rs | 13 ++++++++++---
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/tools/miri/Cargo.lock b/src/tools/miri/Cargo.lock
index 60ebf3057a704..9fca72b095b3b 100644
--- a/src/tools/miri/Cargo.lock
+++ b/src/tools/miri/Cargo.lock
@@ -842,9 +842,9 @@ dependencies = [
 
 [[package]]
 name = "ui_test"
-version = "0.11.0"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b75049e51d3db204b2de79c8ff7a8675c628d81ceef6ec97598c1ab7d4d66802"
+checksum = "24a2e70adc9d18b9b4dd80ea57aeec447103c6fbb354a07c080adad451c645e1"
 dependencies = [
  "bstr",
  "cargo-platform",
diff --git a/src/tools/miri/Cargo.toml b/src/tools/miri/Cargo.toml
index 98dab49f3ef8d..50864334fc51e 100644
--- a/src/tools/miri/Cargo.toml
+++ b/src/tools/miri/Cargo.toml
@@ -36,7 +36,7 @@ libloading = "0.7"
 
 [dev-dependencies]
 colored = "2"
-ui_test = "0.11"
+ui_test = "0.11.6"
 rustc_version = "0.4"
 # Features chosen to match those required by env_logger, to avoid rebuilds
 regex = { version = "1.5.5", default-features = false, features = ["perf", "std"] }
diff --git a/src/tools/miri/tests/compiletest.rs b/src/tools/miri/tests/compiletest.rs
index c57c6c2f25f79..d43dc6b92a3f8 100644
--- a/src/tools/miri/tests/compiletest.rs
+++ b/src/tools/miri/tests/compiletest.rs
@@ -3,8 +3,8 @@ use regex::bytes::Regex;
 use std::ffi::OsString;
 use std::path::{Path, PathBuf};
 use std::{env, process::Command};
-use ui_test::CommandBuilder;
 use ui_test::{color_eyre::Result, Config, Match, Mode, OutputConflictHandling};
+use ui_test::{status_emitter, CommandBuilder};
 
 fn miri_path() -> PathBuf {
     PathBuf::from(option_env!("MIRI").unwrap_or(env!("CARGO_BIN_EXE_miri")))
@@ -149,8 +149,15 @@ fn run_tests(mode: Mode, path: &str, target: &str, with_dependencies: bool) -> R
         // This could be used to overwrite the `Config` on a per-test basis.
         |_, _| None,
         (
-            ui_test::status_emitter::Text,
-            ui_test::status_emitter::Gha::<false> { name: format!("{mode:?} {path} ({target})") },
+            if quiet {
+                Box::<status_emitter::Quiet>::default()
+                    as Box<dyn status_emitter::StatusEmitter + Send>
+            } else {
+                Box::new(status_emitter::Text)
+            },
+            status_emitter::Gha::</* GHA Actions groups*/ false> {
+                name: format!("{mode:?} {path} ({target})"),
+            },
         ),
     )
 }