From d43cb7121e8d651e9e2d4f48ead98c173f26af7d Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Thu, 9 May 2024 09:18:14 +0200
Subject: [PATCH] minor tweaks

---
 src/tools/miri/CONTRIBUTING.md             | 1 +
 src/tools/miri/miri-script/src/commands.rs | 6 ++----
 src/tools/miri/miri-script/src/main.rs     | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/tools/miri/CONTRIBUTING.md b/src/tools/miri/CONTRIBUTING.md
index 39aed51f5df..57682e60c37 100644
--- a/src/tools/miri/CONTRIBUTING.md
+++ b/src/tools/miri/CONTRIBUTING.md
@@ -73,6 +73,7 @@ For example:
 You can (cross-)run the entire test suite using:
 
 ```sh
+./miri test
 ./miri test --target i686-unknown-linux-gnu
 ```
 
diff --git a/src/tools/miri/miri-script/src/commands.rs b/src/tools/miri/miri-script/src/commands.rs
index 968dc62cd98..43abf180d3e 100644
--- a/src/tools/miri/miri-script/src/commands.rs
+++ b/src/tools/miri/miri-script/src/commands.rs
@@ -491,10 +491,8 @@ impl Command {
             // Found it!
             e.sh.set_var("MIRI_TEST_TARGET", target);
 
-            let triple = target
-                .clone()
-                .into_string()
-                .map_err(|_| anyhow!("invalid target triple encoding"))?;
+            let triple =
+                target.clone().into_string().map_err(|_| anyhow!("target triple is not UTF-8"))?;
             Some(triple)
         } else if let Ok(target) = std::env::var("MIRI_TEST_TARGET") {
             // Convert `MIRI_TEST_TARGET` into `--target`.
diff --git a/src/tools/miri/miri-script/src/main.rs b/src/tools/miri/miri-script/src/main.rs
index c92513a0fa7..c19c4c91c65 100644
--- a/src/tools/miri/miri-script/src/main.rs
+++ b/src/tools/miri/miri-script/src/main.rs
@@ -87,7 +87,7 @@ Just build miri. <flags> are passed to `cargo build`.
 ./miri check <flags>:
 Just check miri. <flags> are passed to `cargo check`.
 
-./miri test [--bless] [--target] <flags>:
+./miri test [--bless] [--target <target>] <flags>:
 Build miri, set up a sysroot and then run the test suite. <flags> are passed
 to the test harness.
 
@@ -165,7 +165,7 @@ fn main() -> Result<()> {
                             let target_str = value
                                 .clone()
                                 .into_string()
-                                .map_err(|_| anyhow!("invalid target triple encoding"))?;
+                                .map_err(|_| anyhow!("target triple is not UTF-8"))?;
                             Some(target_str)
                         } else {
                             bail!("no target triple found")