Skip to content

Commit

Permalink
fix/ci: change clippy to be optional
Browse files Browse the repository at this point in the history
Pull request: #2
Approved by: MichaelHirn
  • Loading branch information
hobofan authored and homu committed Nov 27, 2015
1 parent 2328dd3 commit db13da2
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 8 deletions.
18 changes: 14 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,15 @@ rust:
- stable
matrix:
allow_failures:
- rust: beta
- rust: stable
- rust: beta
- rust: stable
- rust: nightly
env: TRAVIS_CARGO_NIGHTLY_FEATURE=lint
exclude:
- rust: beta
env: TRAVIS_CARGO_NIGHTLY_FEATURE=lint
- rust: stable
env: TRAVIS_CARGO_NIGHTLY_FEATURE=lint
before_script:
- |
pip install 'travis-cargo<0.2' --user &&
Expand All @@ -23,6 +30,7 @@ addons:
- libcurl4-openssl-dev
- libelf-dev
- libdw-dev
- libblas-dev
install:
- sudo apt-get update
- sudo apt-get install fglrx opencl-headers
Expand All @@ -34,5 +42,7 @@ notifications:
on_success: never
env:
global:
- TRAVIS_CARGO_NIGHTLY_FEATURE=dev
- secure: iq9uF0iCndl7hnnUmtL9qdYaDvBvPGrImFtrDq1XtJQoNurXYO9OXyOyTIBGFIRkwfEt8Fk79cWaif6hktpammv/0uWrVzRQd8b6stOFRjOJ9fJ46ETQcNn3usr2YrRdTm7k01GXB1U5RSyYYiG63pcIkcui2NgOmnqZaCuQ4pJsHWQVGUbBey5vLTEC1zAdfYY4V9554yVW1V+eA9Atdnur8f9gUbkkG/XKhoKcpT3UtS6MD7MAPIH1Rnrf8GXIc1NAxzLD0zcKBo2o3yIbfGMm4RgRnmI6tRZBI0MgDoB8/1AGLZbBWoSaB5d7S8f/ghqzMu2AnM1HO26sTGYvy0kwt9DAmdBVcB82yFV4y4KMCr0R0Kz9XO3jukl42cmyPyYWAFQG8TO+/LjvPuj1PDSTvvvvit9QotCS+q9FE2aG5lag6W55GlMNPhR2JqLQtuCSaEgkDOmGQIDvZLkceekC2gC6/ryVcDNOUEYyUFrLpd20koDfuttth73tnYgcDIqWIoZ5nhQw1ciXfkSiP9/rOFKTZZXvO0KVgVi95Pwn4xjbBPOWQelIJtOzGRzehUaBnYZWKVFsyk7d7BVK9hWWv2DeOsbGc5Oz9X70ThAA/9d3E2vjVlJmwrijVSWnga/SJFhV5XgYaAO1vHe2tMDJGtGAT9B4ZWjuudNYPyg=
- secure: iq9uF0iCndl7hnnUmtL9qdYaDvBvPGrImFtrDq1XtJQoNurXYO9OXyOyTIBGFIRkwfEt8Fk79cWaif6hktpammv/0uWrVzRQd8b6stOFRjOJ9fJ46ETQcNn3usr2YrRdTm7k01GXB1U5RSyYYiG63pcIkcui2NgOmnqZaCuQ4pJsHWQVGUbBey5vLTEC1zAdfYY4V9554yVW1V+eA9Atdnur8f9gUbkkG/XKhoKcpT3UtS6MD7MAPIH1Rnrf8GXIc1NAxzLD0zcKBo2o3yIbfGMm4RgRnmI6tRZBI0MgDoB8/1AGLZbBWoSaB5d7S8f/ghqzMu2AnM1HO26sTGYvy0kwt9DAmdBVcB82yFV4y4KMCr0R0Kz9XO3jukl42cmyPyYWAFQG8TO+/LjvPuj1PDSTvvvvit9QotCS+q9FE2aG5lag6W55GlMNPhR2JqLQtuCSaEgkDOmGQIDvZLkceekC2gC6/ryVcDNOUEYyUFrLpd20koDfuttth73tnYgcDIqWIoZ5nhQw1ciXfkSiP9/rOFKTZZXvO0KVgVi95Pwn4xjbBPOWQelIJtOzGRzehUaBnYZWKVFsyk7d7BVK9hWWv2DeOsbGc5Oz9X70ThAA/9d3E2vjVlJmwrijVSWnga/SJFhV5XgYaAO1vHe2tMDJGtGAT9B4ZWjuudNYPyg=
matrix:
- TRAVIS_CARGO_NIGHTLY_FEATURE=dev
- TRAVIS_CARGO_NIGHTLY_FEATURE=lint
6 changes: 4 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@ rblas = "0.0.10"
enum_primitive = "0.1.0"
byteorder = "0.4"
num = "0.1"
clippy = "0.0.23"

clippy = { version = "0.0.23", optional = true }

[features]
default = []
dev = [] # possibly for clippy
dev = []
lint = ["clippy"]
4 changes: 2 additions & 2 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
//! [autumn]: http://autumnai.com
//! [leaf]: https://github.com/autumnai/leaf
//! [glium]: https://github.com/tomaka/glium
#![feature(plugin)]
#![plugin(clippy)]
#![cfg_attr(lint, feature(plugin))]
#![cfg_attr(lint, plugin(clippy))]
#![allow(dead_code)]
#![feature(associated_consts)]
#![feature(associated_type_defaults)]
Expand Down

0 comments on commit db13da2

Please sign in to comment.