Pass cargo clippy

lipeng31 · lipeng31 · commit f3f198812cc9 · 2018-12-06T00:10:28.000+08:00
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ language: rust
 cache: cargo
 rust:
   - nightly
-  - nightly-2016-10-18
+  - nightly-2018-12-04
   - beta
   - stable
 matrix:
@@ -12,9 +12,10 @@ matrix:
 script:
   - |
     if [[ "$TRAVIS_RUST_VERSION" == nightly* ]]; then
-        cargo build --verbose --features="clippy"
+        cargo clippy
+        cargo build --verbose
     else
-        cargo build --verbose 
+        cargo build --verbose
     fi
 addons:
   apt:
diff --git a/Cargo.toml b/Cargo.toml
@@ -27,7 +27,6 @@ serde_derive = "1.0"
 serde_json = "1.0"
 sha2 = "0.8"
 toml = "0.4"
-clippy = {version= "0.0.302", optional = true}
 
 
 [features]
diff --git a/src/main.rs b/src/main.rs
@@ -5,9 +5,6 @@
 // <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
-#![cfg_attr(feature = "clippy", feature(plugin))]
-#![cfg_attr(feature = "clippy", plugin(clippy))]
-#![cfg_attr(not(feature = "clippy"), allow(unknown_lints))]//ignore clippy lints on stable
 #![deny(warnings)]
 extern crate serde_json;
 extern crate router;
@@ -73,7 +70,7 @@ impl Config {
 
         let mut file = match File::open(&path) {
             Ok(file) => file,
-            Err(_) => panic!("Could not find config file {}!", path),
+            Err(_e) => panic!("Could not find config file {}!", path),
         };
         file.read_to_string(&mut config_toml)
             .unwrap_or_else(|err| panic!("Error while reading config: [{}]", err));
@@ -357,7 +354,7 @@ fn main() {
     let mirror = Mirror {
         remote_api: config.remote_api,
         crates_path: base_path,
-        index_path: index_path,
+        index_path,
         active_downloads: Arc::new(RwLock::new(HashSet::new())),
     };
     let mut router = Router::new();
@@ -371,7 +368,7 @@ fn main() {
                  .origin
                  .map(|o| o.url)
                  .clone()
-                 .unwrap_or(format!("file://{}", base_dir.to_str().unwrap())));
+                 .unwrap_or_else(|| format!("file://{}", base_dir.to_str().unwrap())));
 
     Iron::new(router)
         .http(url)
