diff --git a/.travis.yml b/.travis.yml index a1be31d67f4..b7118865a0d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,10 +31,9 @@ matrix: - env: INTEGRATION=rand - env: INTEGRATION=rust-clippy - env: INTEGRATION=rust-semverver - - env: INTEGRATION=stdsimd - env: INTEGRATION=tempdir allow_failures: - # Need to run an lalrpop build step before testing? + # See: https://github.com/rust-lang-nursery/rustfmt/issues/2789 - env: INTEGRATION=chalk # PR sent - env: INTEGRATION=crater @@ -44,6 +43,8 @@ matrix: - env: INTEGRATION=rust-clippy # Doesn't build - env: INTEGRATION=rust-semverver + # See: https://github.com/rust-lang-nursery/rustfmt/issues/2787 + - env: INTEGRATION=stdsimd before_script: - | diff --git a/ci/integration.sh b/ci/integration.sh index 4f80207599f..461effbf557 100755 --- a/ci/integration.sh +++ b/ci/integration.sh @@ -27,7 +27,7 @@ cargo fmt -- --version # * `cargo test -all` still passes (formatting did not break the build) function check_fmt { touch rustfmt.toml - cargo fmt --all -v 2>&1 | tee rustfmt_output + cargo fmt --all -v |& tee rustfmt_output if [[ ${PIPESTATUS[0]} != 0 ]]; then cat rustfmt_output return 1 @@ -45,7 +45,7 @@ function check_fmt { if [[ $? != 0 ]]; then return 1 fi - cargo fmt --all -- --check 2>&1 | tee rustfmt_check_output + cargo fmt --all -- --check |& tee rustfmt_check_output if [[ ${PIPESTATUS[0]} != 0 ]]; then cat rustfmt_check_output return 1