Merge #3575

3575: Restore cargo-fmt gating r=matklad a=matklad



bors r+
🤖

Co-authored-by: Aleksey Kladov <[email protected]>

1 files changed, 3 insertions, 5 deletions

diff --git a/xtask/src/lib.rs b/xtask/src/lib.rs
index 014b61b37..e1472e85d 100644
--- a/xtask/src/lib.rs
+++ b/xtask/src/lib.rs
@@ -38,13 +38,11 @@ pub fn project_root() -> PathBuf {
 }
 
 pub fn run_rustfmt(mode: Mode) -> Result<()> {
+    let _dir = pushd(project_root());
     ensure_rustfmt()?;
 
-    if mode == Mode::Verify {
-        run!("rustup run {} -- cargo fmt -- --check", TOOLCHAIN)?;
-    } else {
-        run!("rustup run {} -- cargo fmt", TOOLCHAIN)?;
-    }
+    let check = if mode == Mode::Verify { "--check" } else { "" };
+    run!("rustup run {} -- cargo fmt -- {}", TOOLCHAIN, check)?;
     Ok(())
 }