Merge pull request #147 from rust-lang/clippy-warnings

Fix a couple of clippy warnings

Author: sdroege

Cargo.toml

@@ -12,6 +12,7 @@ A library to run the pkg-config system tool at build time in order to be used in
 Cargo build scripts.
 """
 keywords = ["build-dependencies"]
+rust-version = "1.30"
 
 [dev-dependencies]
 lazy_static = "1"

src/lib.rs

@@ -446,7 +446,7 @@ impl Config {
         match (env::var("TARGET"), env::var("HOST")) {
             (Ok(target), Ok(host)) => {
                 let kind = if host == target { "HOST" } else { "TARGET" };
-                let target_u = target.replace("-", "_");
+                let target_u = target.replace('-', "_");
 
                 self.env_var_os(&format!("{}_{}", var_base, target))
                     .or_else(|| self.env_var_os(&format!("{}_{}", var_base, target_u)))
@@ -802,8 +802,8 @@ impl Library {
             }
         }
 
-        let mut linker_options = words.iter().filter(|arg| arg.starts_with("-Wl,"));
-        while let Some(option) = linker_options.next() {
+        let linker_options = words.iter().filter(|arg| arg.starts_with("-Wl,"));
+        for option in linker_options {
             let mut pop = false;
             let mut ld_option = vec![];
             for subopt in option[4..].split(',') {
@@ -829,7 +829,7 @@ impl Library {
     }
 
     fn parse_modversion(&mut self, output: &str) {
-        self.version.push_str(output.lines().nth(0).unwrap().trim());
+        self.version.push_str(output.lines().next().unwrap().trim());
     }
 }
 

tests/test.rs

@@ -24,10 +24,7 @@ fn reset() {
     }
     env::remove_var("TARGET");
     env::remove_var("HOST");
-    env::set_var(
-        "PKG_CONFIG_PATH",
-        &env::current_dir().unwrap().join("tests"),
-    );
+    env::set_var("PKG_CONFIG_PATH", env::current_dir().unwrap().join("tests"));
 }
 
 fn find(name: &str) -> Result<pkg_config::Library, Error> {