From 680182d0a0853a3a76fd1cae9838feb5b0acf31c Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Fri, 13 Mar 2020 12:28:13 +0100 Subject: Restore cargo-fmt gating --- xtask/src/lib.rs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'xtask/src/lib.rs') 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(()) } -- cgit v1.2.3