Switch from clippy dependency to cargo-clippy
This commit is contained in:
parent
200d33cb4a
commit
70795865c9
4 changed files with 6 additions and 10 deletions
|
@ -11,10 +11,10 @@ env:
|
||||||
global:
|
global:
|
||||||
- secure: ZUcdcbS8xbpdII9FSPx7VtoVhEkJhWL2Hb75tDlKDHNhfXqmt1NyB9q/2qXJ5Ulp4MnYXwsI8LsDloR6gvdB4xElay3smuF/neGvMjrqcB15/2p0MSQ+kZjMsNB6mlb5kAlm8ahduXIscppmw/V+m5hn3Vo+RQz/Ng+pzv0nc8KEXPMYrfRFg+a7FaeIbRbb8ir9EfflUSqArLq2hbi2WdhM3hFMcCIAUt6DD4x5ubjEg60OnIof5FDu0mXMXzQvUfHWOeYnsNcD/DLyDnm6FuQEzk37M4EB8op2SdBUeQMQ5abR3i2rd//DZpbTTEjud0PseWohGAwTwL2aoFrqs7uYQMx+vcGlOzAyDUm4VemVUa3F2BECdzU5BiujcKOITJEVUYWongld93arQq34FuXG/TO/T1XrerxfG6LTkTkKS5Vz7W8z6Rloa99WrQLJg1ZJP6itEU7G7KsDFVgRhsg7rz4/dV/2+cV4UvIwd4HlGXKCFlH0SClqvM3/7i/qqCD0689SJW6Zip+ly38MXlGy2s/AmReEasXvFer9JkOEIuPa8QTBNAjDlw7bWXi6neQWBIZU1VhZcSssnrVmEFN8fNklShzpw5DyKCv8jPTx2O6Dw8B/LgIK8uo+eaTXiO6zz/T1c/qEdsYslvxPA2D3F+ONpPU7238ykT4eRog=
|
- secure: ZUcdcbS8xbpdII9FSPx7VtoVhEkJhWL2Hb75tDlKDHNhfXqmt1NyB9q/2qXJ5Ulp4MnYXwsI8LsDloR6gvdB4xElay3smuF/neGvMjrqcB15/2p0MSQ+kZjMsNB6mlb5kAlm8ahduXIscppmw/V+m5hn3Vo+RQz/Ng+pzv0nc8KEXPMYrfRFg+a7FaeIbRbb8ir9EfflUSqArLq2hbi2WdhM3hFMcCIAUt6DD4x5ubjEg60OnIof5FDu0mXMXzQvUfHWOeYnsNcD/DLyDnm6FuQEzk37M4EB8op2SdBUeQMQ5abR3i2rd//DZpbTTEjud0PseWohGAwTwL2aoFrqs7uYQMx+vcGlOzAyDUm4VemVUa3F2BECdzU5BiujcKOITJEVUYWongld93arQq34FuXG/TO/T1XrerxfG6LTkTkKS5Vz7W8z6Rloa99WrQLJg1ZJP6itEU7G7KsDFVgRhsg7rz4/dV/2+cV4UvIwd4HlGXKCFlH0SClqvM3/7i/qqCD0689SJW6Zip+ly38MXlGy2s/AmReEasXvFer9JkOEIuPa8QTBNAjDlw7bWXi6neQWBIZU1VhZcSssnrVmEFN8fNklShzpw5DyKCv8jPTx2O6Dw8B/LgIK8uo+eaTXiO6zz/T1c/qEdsYslvxPA2D3F+ONpPU7238ykT4eRog=
|
||||||
script:
|
script:
|
||||||
|
- cargo build --verbose
|
||||||
- |
|
- |
|
||||||
if [ "$TRAVIS_RUST_VERSION" = nightly ]; then
|
if [ "$TRAVIS_RUST_VERSION" = nightly ]; then
|
||||||
cargo build --features clippy --verbose
|
cargo install clippy --debug
|
||||||
else
|
cargo clippy -- -Dclippy
|
||||||
cargo build --verbose
|
|
||||||
fi
|
fi
|
||||||
- cargo test --verbose
|
- cargo test --verbose
|
||||||
|
|
|
@ -10,7 +10,6 @@ repository = "https://github.com/chyh1990/yaml-rust"
|
||||||
publish = false # this branch contains breaking changes
|
publish = false # this branch contains breaking changes
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
clippy = { version = "^0.*", optional = true }
|
|
||||||
linked-hash-map = ">=0.0.9, <0.5"
|
linked-hash-map = ">=0.0.9, <0.5"
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
|
|
|
@ -36,11 +36,8 @@
|
||||||
//!
|
//!
|
||||||
//! ```
|
//! ```
|
||||||
|
|
||||||
#![cfg_attr(feature="clippy", feature(plugin))]
|
#![cfg_attr(feature = "cargo-clippy", warn(cyclomatic_complexity))]
|
||||||
#![cfg_attr(feature="clippy", plugin(clippy))]
|
#![cfg_attr(feature = "cargo-clippy", allow(match_same_arms))]
|
||||||
#![cfg_attr(feature="clippy", deny(clippy))]
|
|
||||||
#![cfg_attr(feature="clippy", warn(cyclomatic_complexity))]
|
|
||||||
#![cfg_attr(feature="clippy", allow(match_same_arms))]
|
|
||||||
|
|
||||||
extern crate linked_hash_map;
|
extern crate linked_hash_map;
|
||||||
|
|
||||||
|
|
|
@ -273,7 +273,7 @@ impl Yaml {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg_attr(feature="clippy", allow(should_implement_trait))]
|
#[cfg_attr(feature = "cargo-clippy", allow(should_implement_trait))]
|
||||||
impl Yaml {
|
impl Yaml {
|
||||||
// Not implementing FromStr because there is no possibility of Error.
|
// Not implementing FromStr because there is no possibility of Error.
|
||||||
// This function falls back to Yaml::String if nothing else matches.
|
// This function falls back to Yaml::String if nothing else matches.
|
||||||
|
|
Loading…
Reference in a new issue