Skip to content

Commit cb06cb2

Browse files
committed
Auto merge of #8228 - matthiaskrgr:clippy_v13, r=ehuss
more clippy fixes
2 parents ab20265 + 63ffc6a commit cb06cb2

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/cargo/core/compiler/build_context/target_info.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ impl TargetInfo {
375375
suffix,
376376
prefix: prefix.clone(),
377377
flavor: FileFlavor::DebugInfo,
378-
crate_type: Some(crate_type.clone()),
378+
crate_type: Some(crate_type),
379379
// macOS tools like lldb use all sorts of magic to locate
380380
// dSYM files. See https://lldb.llvm.org/use/symbols.html
381381
// for some details. It seems like a `.dSYM` located next
@@ -389,7 +389,7 @@ impl TargetInfo {
389389
suffix: ".pdb".to_string(),
390390
prefix: prefix.clone(),
391391
flavor: FileFlavor::DebugInfo,
392-
crate_type: Some(crate_type.clone()),
392+
crate_type: Some(crate_type),
393393
// The absolute path to the pdb file is embedded in the
394394
// executable. If the exe/pdb pair is moved to another
395395
// machine, then debuggers will look in the same directory
@@ -466,7 +466,7 @@ impl TargetInfo {
466466
} else {
467467
FileFlavor::Normal
468468
};
469-
let file_types = self.file_types(&crate_type, flavor, target_triple)?;
469+
let file_types = self.file_types(crate_type, flavor, target_triple)?;
470470
match file_types {
471471
Some(types) => {
472472
result.extend(types);

src/cargo/core/compiler/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -777,7 +777,7 @@ fn build_base_args(
777777
cmd.arg("-C").arg(format!("panic={}", panic));
778778
}
779779

780-
match cx.lto[&unit] {
780+
match cx.lto[unit] {
781781
lto::Lto::Run(None) => {
782782
cmd.arg("-C").arg("lto");
783783
}

0 commit comments

Comments
 (0)