From 2b2aebae2c33655af6f2377906371f76d5a33f6e Mon Sep 17 00:00:00 2001 From: Nick Cameron Date: Tue, 2 Jul 2019 09:56:01 +1200 Subject: [PATCH] Remove toolchain special casing Since various bugs are fixed upstream Closes #55 Signed-off-by: Nick Cameron --- .travis.yml | 5 +---- rust-toolchain | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 rust-toolchain diff --git a/.travis.yml b/.travis.yml index cd03564f..221109da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ os: rust: # Requires nightly for now, stable can be re-enabled when 1.36 is stable. # - stable - - nightly-2019-05-22 + - nightly env: global: - RUST_BACKTRACE=1 @@ -28,9 +28,6 @@ addons: - go install: - # FIXME(#55) Remove when Clippy is fixed in current nightly - - if [[ $TRAVIS_OS_NAME == "linux" ]]; then rustup toolchain install nightly-2019-05-22; fi - - if [[ $TRAVIS_OS_NAME == "linux" ]]; then rustup default nightly-2019-05-22; fi - if [[ $TRAVIS_OS_NAME == "linux" ]]; then rustup component add rustfmt; fi - if [[ $TRAVIS_OS_NAME == "linux" ]]; then rustup component add clippy; fi - if [[ $TRAVIS_OS_NAME == "windows" ]]; then choco install golang cmake strawberryperl protoc; fi diff --git a/rust-toolchain b/rust-toolchain deleted file mode 100644 index f677ace0..00000000 --- a/rust-toolchain +++ /dev/null @@ -1 +0,0 @@ -nightly-2019-05-22