diff options
Diffstat (limited to 'xtask/src/main.rs')
-rw-r--r-- | xtask/src/main.rs | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 3c4332f75..25fd32f92 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs | |||
@@ -89,11 +89,16 @@ fn run_rustfmt(mode: Mode) -> Result<()> { | |||
89 | let _dir = pushd(project_root())?; | 89 | let _dir = pushd(project_root())?; |
90 | let _e = pushenv("RUSTUP_TOOLCHAIN", "stable"); | 90 | let _e = pushenv("RUSTUP_TOOLCHAIN", "stable"); |
91 | ensure_rustfmt()?; | 91 | ensure_rustfmt()?; |
92 | let check = match mode { | 92 | match mode { |
93 | Mode::Overwrite => &[][..], | 93 | Mode::Overwrite => cmd!("cargo fmt").run()?, |
94 | Mode::Verify => &["--", "--check"], | 94 | Mode::Ensure => { |
95 | let res = cmd!("cargo fmt -- --check").run(); | ||
96 | if !res.is_ok() { | ||
97 | let _ = cmd!("cargo fmt").run(); | ||
98 | } | ||
99 | res?; | ||
100 | } | ||
95 | }; | 101 | }; |
96 | cmd!("cargo fmt {check...}").run()?; | ||
97 | Ok(()) | 102 | Ok(()) |
98 | } | 103 | } |
99 | 104 | ||