Auto merge of #8228 - matthiaskrgr:clippy_v13, r=ehuss

more clippy fixes
rust-lang · May 8, 2020 · cb06cb2 · cb06cb2
2 parents ab20265 + 63ffc6a
commit cb06cb2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/cargo/core/compiler/build_context/target_info.rs b/src/cargo/core/compiler/build_context/target_info.rs
@@ -375,7 +375,7 @@ impl TargetInfo {
                     suffix,
                     prefix: prefix.clone(),
                     flavor: FileFlavor::DebugInfo,
-                    crate_type: Some(crate_type.clone()),
+                    crate_type: Some(crate_type),
                     // macOS tools like lldb use all sorts of magic to locate
                     // dSYM files. See https://lldb.llvm.org/use/symbols.html
                     // for some details. It seems like a `.dSYM` located next
@@ -389,7 +389,7 @@ impl TargetInfo {
                     suffix: ".pdb".to_string(),
                     prefix: prefix.clone(),
                     flavor: FileFlavor::DebugInfo,
-                    crate_type: Some(crate_type.clone()),
+                    crate_type: Some(crate_type),
                     // The absolute path to the pdb file is embedded in the
                     // executable. If the exe/pdb pair is moved to another
                     // machine, then debuggers will look in the same directory
@@ -466,7 +466,7 @@ impl TargetInfo {
             } else {
                 FileFlavor::Normal
             };
-            let file_types = self.file_types(&crate_type, flavor, target_triple)?;
+            let file_types = self.file_types(crate_type, flavor, target_triple)?;
             match file_types {
                 Some(types) => {
                     result.extend(types);

diff --git a/src/cargo/core/compiler/mod.rs b/src/cargo/core/compiler/mod.rs
@@ -777,7 +777,7 @@ fn build_base_args(
         cmd.arg("-C").arg(format!("panic={}", panic));
     }
 
-    match cx.lto[&unit] {
+    match cx.lto[unit] {
         lto::Lto::Run(None) => {
             cmd.arg("-C").arg("lto");
         }