summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorChristian Duerr <chrisduerr@users.noreply.github.com>2018-06-17 09:19:30 +0000
committerGitHub <noreply@github.com>2018-06-17 09:19:30 +0000
commit5ba34d4f9766a55a06ed5e3e44cc384af1b09f65 (patch)
tree11965fbe66f5d25ea00be1a02e74b724c4071d3c /.travis.yml
parent0f700a01bd73623cdfc0afc4a54f9e82f46d8f49 (diff)
Move to cargo clippy
Using clippy as a library has been deprecated, instead the `cargo clippy` command should be used instead. To comply with this change clippy has been removed from the `Cargo.toml` and is now installed with cargo when building in CI. This has also lead to a few new clippy issues to show up, this includes everything in the `font` subdirectory. This has been fixed and `font` should now be covered by clippy CI too. This also upgrades all dependencies, as a result this fixes #1341 and this fixes #1344.
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml14
1 files changed, 9 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index f5356354..2b6192d7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,18 +12,22 @@ rust:
- nightly
env:
- - FEATURES="clippy"
- - FEATURES=""
+ - CLIPPY="true"
+ - CLIPPY=""
+
+install:
+ - if [ -n "$CLIPPY" ]; then cargo install -f clippy; fi
matrix:
fast_finish: true
exclude:
- rust: stable
- env: FEATURES="clippy"
+ env: CLIPPY="true"
- rust: nightly
- env: FEATURES=""
+ env: CLIPPY=""
allow_failures:
- rust: nightly
script:
- - cargo test --no-default-features --features "$FEATURES"
+ - if [ -n "$CLIPPY" ]; then cargo clippy; fi
+ - if [ -z "$CLIPPY" ]; then cargo test; fi