From a9714227bde1ad9e280d087acf513b0420afd871 Mon Sep 17 00:00:00 2001 From: Michael Wright Date: Sun, 28 Jul 2019 06:41:29 +0200 Subject: [PATCH] Enable rustfmt tests This reverts commit d73a953db7a8120ec00b31c57d7092aff0f2c10b. --- .travis.yml | 2 +- appveyor.yml | 2 +- tests/fmt.rs | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0b012139d7a..0a1bd0ea275 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ env: install: - | if [ -z ${INTEGRATION} ]; then - # rustup component add rustfmt || cargo install --git https://github.com/rust-lang/rustfmt/ --force + rustup component add rustfmt || cargo install --git https://github.com/rust-lang/rustfmt/ --force if [ "$TRAVIS_OS_NAME" == "linux" ]; then . $HOME/.nvm/nvm.sh nvm install stable diff --git a/appveyor.yml b/appveyor.yml index 4cea8d99ec6..9f6cc45af81 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -22,7 +22,7 @@ install: - del rust-toolchain - cargo install rustup-toolchain-install-master --debug || echo "rustup-toolchain-install-master already installed" - rustup-toolchain-install-master %RUSTC_HASH% -f -n master - #- rustup component add rustfmt --toolchain nightly + - rustup component add rustfmt --toolchain nightly - rustup default master - set PATH=%PATH%;C:\Users\appveyor\.rustup\toolchains\master\bin - rustc -V diff --git a/tests/fmt.rs b/tests/fmt.rs index 65a1c50e46d..bc37be84b43 100644 --- a/tests/fmt.rs +++ b/tests/fmt.rs @@ -1,7 +1,6 @@ use std::process::Command; #[test] -#[ignore] fn fmt() { if option_env!("RUSTC_TEST_SUITE").is_some() { return;