diff options
| author | flip1995 <hello@philkrones.com> | 2018-11-27 21:11:05 +0100 |
|---|---|---|
| committer | flip1995 <hello@philkrones.com> | 2018-11-27 21:11:05 +0100 |
| commit | 4e0938d349e95cf6bc8edd1d48197db65c8ecd87 (patch) | |
| tree | 2d91ee42acfcf72e87d79906d236512df2c05210 | |
| parent | ccff495b62bc86e2e18ec93795c453b9e1d4cd26 (diff) | |
| download | rust-4e0938d349e95cf6bc8edd1d48197db65c8ecd87.tar.gz rust-4e0938d349e95cf6bc8edd1d48197db65c8ecd87.zip | |
Let travis run cargo fmt --all -- --check
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rwxr-xr-x | ci/base-tests.sh | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 8730535d629..45fc5278517 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,6 +30,7 @@ before_install: install: - | if [ -z ${INTEGRATION} ]; then + rustup component add rustfmt-preview || cargo install --git https://github.com/rust-lang/rustfmt/ --force if [ "$TRAVIS_OS_NAME" == "linux" ]; then . $HOME/.nvm/nvm.sh nvm install stable @@ -48,7 +49,7 @@ matrix: - os: linux env: BASE_TESTS=true - os: windows - env: BASE_TEST=true + env: BASE_TESTS=true - env: INTEGRATION=rust-lang/cargo - env: INTEGRATION=rust-random/rand - env: INTEGRATION=rust-lang-nursery/stdsimd @@ -64,7 +65,7 @@ matrix: - env: INTEGRATION=hyperium/hyper allow_failures: - os: windows - env: BASE_TEST=true + env: BASE_TESTS=true # prevent these jobs with default env vars exclude: - os: linux diff --git a/ci/base-tests.sh b/ci/base-tests.sh index 88cc20842e8..e46f8c4c39a 100755 --- a/ci/base-tests.sh +++ b/ci/base-tests.sh @@ -26,6 +26,7 @@ cd clippy_dev && cargo test && cd .. # Perform various checks for lint registration ./util/dev update_lints --check +cargo +nightly fmt --all -- --check CLIPPY="`pwd`/target/debug/cargo-clippy clippy" # run clippy on its own codebase... |