diff options
| author | bjorn3 <bjorn3@users.noreply.github.com> | 2021-07-06 17:49:23 +0200 |
|---|---|---|
| committer | bjorn3 <bjorn3@users.noreply.github.com> | 2021-07-06 17:49:23 +0200 |
| commit | 56ee9864c187a2a754a44be7d6ac529dda9058fc (patch) | |
| tree | 20554aeb81efee07eeadb1da3dd9e0b35bc56eeb /compiler | |
| parent | 5aaa953dcc377ce9c9a01fba0f54d097d029e7fb (diff) | |
| download | rust-56ee9864c187a2a754a44be7d6ac529dda9058fc.tar.gz rust-56ee9864c187a2a754a44be7d6ac529dda9058fc.zip | |
Don't pass local_crate_name to link_binary separately
It is already part of CodegenResults
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/rustc_codegen_cranelift/src/lib.rs | 1 | ||||
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/lib.rs | 7 | ||||
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/back/link.rs | 8 |
3 files changed, 7 insertions, 9 deletions
diff --git a/compiler/rustc_codegen_cranelift/src/lib.rs b/compiler/rustc_codegen_cranelift/src/lib.rs index b817bf4aff7..ebf98e8694b 100644 --- a/compiler/rustc_codegen_cranelift/src/lib.rs +++ b/compiler/rustc_codegen_cranelift/src/lib.rs @@ -219,7 +219,6 @@ impl CodegenBackend for CraneliftCodegenBackend { sess, &codegen_results, outputs, - &codegen_results.crate_info.local_crate_name.as_str(), ); Ok(()) diff --git a/compiler/rustc_codegen_llvm/src/lib.rs b/compiler/rustc_codegen_llvm/src/lib.rs index fc890f23853..26fd1cfbcd0 100644 --- a/compiler/rustc_codegen_llvm/src/lib.rs +++ b/compiler/rustc_codegen_llvm/src/lib.rs @@ -292,12 +292,7 @@ impl CodegenBackend for LlvmCodegenBackend { // Run the linker on any artifacts that resulted from the LLVM run. // This should produce either a finished executable or library. - link_binary::<LlvmArchiveBuilder<'_>>( - sess, - &codegen_results, - outputs, - &codegen_results.crate_info.local_crate_name.as_str(), - ); + link_binary::<LlvmArchiveBuilder<'_>>(sess, &codegen_results, outputs); Ok(()) } diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs index dfce3c5b7a5..cb8fd263a60 100644 --- a/compiler/rustc_codegen_ssa/src/back/link.rs +++ b/compiler/rustc_codegen_ssa/src/back/link.rs @@ -54,7 +54,6 @@ pub fn link_binary<'a, B: ArchiveBuilder<'a>>( sess: &'a Session, codegen_results: &CodegenResults, outputs: &OutputFilenames, - crate_name: &str, ) { let _timer = sess.timer("link_binary"); let output_metadata = sess.opts.output_types.contains_key(&OutputType::Metadata); @@ -87,7 +86,12 @@ pub fn link_binary<'a, B: ArchiveBuilder<'a>>( .tempdir() .unwrap_or_else(|err| sess.fatal(&format!("couldn't create a temp dir: {}", err))); let path = MaybeTempDir::new(tmpdir, sess.opts.cg.save_temps); - let out_filename = out_filename(sess, crate_type, outputs, crate_name); + let out_filename = out_filename( + sess, + crate_type, + outputs, + &codegen_results.crate_info.local_crate_name.as_str(), + ); match crate_type { CrateType::Rlib => { let _timer = sess.timer("link_rlib"); |
