Rollup merge of #68279 - GuillaumeGomez:clean-up-e0198, r=Dylan-DPC

[rust.git] / src / bootstrap / format.rs

diff --git a/src/bootstrap/format.rs b/src/bootstrap/format.rs
index 65b654fb51929ad8bd429821c3d10efe5c38273d..6e5e3fe07e7467065abd36bbef79a49863ce1c33 100644 (file)
--- a/src/bootstrap/format.rs
+++ b/src/bootstrap/format.rs
@@ -20,7 +20,15 @@ fn rustfmt(src: &Path, rustfmt: &Path, path: &Path, check: bool) {
     cmd.arg(&path);
     let cmd_debug = format!("{:?}", cmd);
     let status = cmd.status().expect("executing rustfmt");
-    assert!(status.success(), "running {} successful", cmd_debug);
+    if !status.success() {
+        eprintln!(
+            "Running `{}` failed.\nIf you're running `tidy`, \
+            try again with `--bless` flag. Or, you just want to format \
+            code, run `./x.py fmt` instead.",
+            cmd_debug,
+        );
+        std::process::exit(1);
+    }
 }
 
 #[derive(serde::Deserialize)]