Use cargo clippy instead of the clippy plugin #176 (#184)

.travis.yml

@@ -25,20 +25,17 @@ env:
 matrix:
   fast_finish: true
   include:
-  - env: LINT="dev"
+  - env: CLIPPY='yes'
     rust: nightly
   allow_failures:
-  - env: LINT="dev"
+  - env: CLIPPY='yes'
 
 script:
   # Test common features.
   - cargo test --features="$FEATURES"
   - |
-    if [ $TRAVIS_RUST_VERSION = 'nightly' ]; then
-        # Enable dev for clippy linting.
-        cargo test --features="$FEATURES $LINT";
-        # Lint nightly feature.
-        cargo test --features="$FEATURES $LINT nightly";
+    if [ $CLIPPY = 'yes' ]; then
+        cargo install clippy && cargo clippy --all-features -- -D warnings;
     fi
   - |
     if [ $TRAVIS_RUST_VERSION = 'stable' ]; then

Cargo.toml

@@ -15,7 +15,6 @@ travis-ci = { repository = "pingcap/rust-prometheus" }
 
 [features]
 default = []
-dev = ["clippy"]
 nightly = ["libc", "spin/unstable"]
 push = ["hyper", "libc"]
 process = ["libc", "procinfo"]
@@ -24,7 +23,6 @@ gen = ["protobuf-codegen-pure"]
 [dependencies]
 protobuf = "2.0"
 quick-error = "0.2"
-clippy = {version = "^0", optional = true}
 fnv = "1.0"
 lazy_static = "0.2"
 libc = {version = "0.2", optional = true}

Makefile

@@ -8,14 +8,13 @@ build:
 test:
 	cargo test --features="${ENABLE_FEATURES}" -- --nocapture
 
-dev: format
-	cargo test --features="${ENABLE_FEATURES} dev" -- --nocapture
+dev: format test
 
 bench: format
 	cargo bench --features=${ENABLE_FEATURES} -- --nocapture
 
 format:
-	@cargo fmt --all -- --write-mode diff >/dev/null || cargo fmt --all
+	@cargo fmt --all -- --check >/dev/null || cargo fmt --all
 
 clean:
 	cargo clean

proto/metrics.rs

@@ -1,4 +1,4 @@
-// This file is generated by rust-protobuf 2.0.0. Do not edit
+// This file is generated by rust-protobuf 2.0.2. Do not edit
 // @generated
 
 // https://github.com/Manishearth/rust-clippy/issues/702

rustfmt.toml

@@ -1,5 +1,2 @@
 reorder_imports = true
-reorder_imports_in_group = true
-reorder_extern_crates = true
-reorder_extern_crates_in_group = true
 use_try_shorthand = true

src/lib.rs

@@ -15,11 +15,7 @@
 The Rust client library for [Prometheus](https://prometheus.io/).
 */
 
-#![cfg_attr(feature = "dev", feature(plugin))]
-#![cfg_attr(feature = "dev", plugin(clippy))]
-#![cfg_attr(not(feature = "dev"), allow(unknown_lints))]
-#![cfg_attr(feature = "dev", allow(needless_pass_by_value))]
-#![cfg_attr(feature = "dev", allow(new_without_default_derive))]
+#![cfg_attr(feature = "cargo-clippy", allow(needless_pass_by_value, new_without_default_derive))]
 #![cfg_attr(feature = "nightly", feature(integer_atomics))]
 
 #[macro_use]

static-metric/rustfmt.toml

@@ -1,5 +1,2 @@
 reorder_imports = true
-reorder_imports_in_group = true
-reorder_extern_crates = true
-reorder_extern_crates_in_group = true
 use_try_shorthand = true