about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2024-04-15 08:20:33 +0000
committerbors <bors@rust-lang.org>2024-04-15 08:20:33 +0000
commit34ab66857e35a6045108519a3c37125e3c581371 (patch)
tree578db2dd803b75083f652ec098fc323a6423a6b7
parent65978edef27a34481e2a6dc54b5d2c507d15de27 (diff)
parent3868c9faaf0a885a15f7d5e34e3b3624d7f4d3f9 (diff)
downloadrust-34ab66857e35a6045108519a3c37125e3c581371.tar.gz
rust-34ab66857e35a6045108519a3c37125e3c581371.zip
Auto merge of #3465 - RalfJung:run-dep-error-format, r=RalfJung
fix error display for './miri run --dep'

Fixes https://github.com/rust-lang/miri/issues/3463
-rw-r--r--src/tools/miri/tests/ui.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/tools/miri/tests/ui.rs b/src/tools/miri/tests/ui.rs
index 7e8d1401183..68446f40e07 100644
--- a/src/tools/miri/tests/ui.rs
+++ b/src/tools/miri/tests/ui.rs
@@ -296,12 +296,13 @@ fn main() -> Result<()> {
 
 fn run_dep_mode(target: String, mut args: impl Iterator<Item = OsString>) -> Result<()> {
     let path = args.next().expect("./miri run-dep must be followed by a file name");
-    let config = miri_config(
+    let mut config = miri_config(
         &target,
         "",
         Mode::Yolo { rustfix: RustfixMode::Disabled },
         /* with dependencies */ true,
     );
+    config.program.args.clear(); // remove the `--error-format` that ui_test adds by default
     let dep_args = config.build_dependencies()?;
 
     let mut cmd = config.program.build(&config.out_dir);