about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-09-01 06:31:39 +0000
committerbors <bors@rust-lang.org>2023-09-01 06:31:39 +0000
commitcae8f934f56216abbed5a6242d455a1e043caed6 (patch)
tree09464a8fad1ff76912a03e8dfe1a1d4f05433df6
parenta346b299d310e20095ba4aa5275c852b6321ae85 (diff)
parentf28772f968a4bea1484376f6baf7daa39778cf5e (diff)
downloadrust-cae8f934f56216abbed5a6242d455a1e043caed6.tar.gz
rust-cae8f934f56216abbed5a6242d455a1e043caed6.zip
Auto merge of #3048 - RalfJung:fmt-skip-children, r=RalfJung
add '--skip-children' to rustfmt invocation

This finally fixes the issue that we format the same file many times (and `./miri fmt --check` shows duplicate diffs). :)
-rw-r--r--src/tools/miri/miri-script/src/commands.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/miri/miri-script/src/commands.rs b/src/tools/miri/miri-script/src/commands.rs
index 2948219ad89..b7031d9a3ee 100644
--- a/src/tools/miri/miri-script/src/commands.rs
+++ b/src/tools/miri/miri-script/src/commands.rs
@@ -510,7 +510,7 @@ impl Command {
 
         let mut cmd = cmd!(
             e.sh,
-            "rustfmt +{toolchain} --edition=2021 --config-path {config_path} {flags...}"
+            "rustfmt +{toolchain} --edition=2021 --config-path {config_path} --unstable-features --skip-children {flags...}"
         );
         eprintln!("$ {cmd} ...");