Skip to content

Commit

Permalink
Revert "Use rustc instead of clippy."
Browse files Browse the repository at this point in the history
This reverts commit ef306a7.

travis-cargo doesn't support --lib or --bin so we can't do this anyway.
  • Loading branch information
Sean1708 committed Jan 4, 2016
1 parent e2c0d50 commit 4b927f2
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
10 changes: 5 additions & 5 deletions .travis.yml
Expand Up @@ -8,15 +8,15 @@ before_script:
- pip install 'travis-cargo>=0.1.0,<0.2.0' --user
- pip install 'CppHeaderParser>=2.7.2,<3.0.0' --user
- export PATH="$HOME/.local/bin:$PATH"
- git clone https://github.com/Manishearth/clippy.git
- cd clippy
- git clone https://github.com/arcnmx/cargo-clippy.git
- cd cargo-clippy
- travis-cargo --only nightly build
- export CLIPPY_PATH="$PWD/target/debug"
- export PATH="$PWD/target/debug:$PATH"
- cd ..
script:
- travis-cargo build
- travis-cargo --only nightly rustc --lib -- -L "$CLIPPY_PATH" -l clippy -Z extra-plugins=clippy -Z no-trans
- travis-cargo --only nightly rustc --bin cheddar -- -L "$CLIPPY_PATH" -l clippy -Z extra-plugins=clippy -Z no-trans
- ./on-nightly cargo clippy --lib
- ./on-nightly cargo clippy --bin cheddar
- travis-cargo test
- travis-cargo --only stable doc
after_success:
Expand Down
6 changes: 6 additions & 0 deletions on-nightly
@@ -0,0 +1,6 @@
#!/usr/bin/env bash

if [[ "$TRAVIS_RUST_VERSION" = 'nightly' ]]
then
$@
fi

0 comments on commit 4b927f2

Please sign in to comment.