Skip to content

Remove toolchain special casing #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Hoverbear merged 2 commits into from
Jul 2, 2019
Merged

Remove toolchain special casing #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b2aeba
Remove toolchain special casing
nrc Jul 1, 2019
5de703b
Merge branch 'master' into toolchain
nrc Jul 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion rust-toolchain
View file
Open in desktop

This file was deleted.