diff options
| author | bors <bors@rust-lang.org> | 2021-07-18 08:15:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-07-18 08:15:17 +0000 |
| commit | 5a8a44196b3cf099f8c9b0156bd902eaec0b4e5f (patch) | |
| tree | 44c6de9143298d107532d67ee58eff441f6ded1d /compiler/rustc_codegen_llvm/src | |
| parent | 3ab6b60337edeb49339d173853fee1f8569421e0 (diff) | |
| parent | 810e47897aae7d19c7f0a58dc8ede07a4caae2a0 (diff) | |
| download | rust-5a8a44196b3cf099f8c9b0156bd902eaec0b4e5f.tar.gz rust-5a8a44196b3cf099f8c9b0156bd902eaec0b4e5f.zip | |
Auto merge of #87242 - JohnTitor:rollup-t9rmwpo, r=JohnTitor
Rollup of 8 pull requests Successful merges: - #86763 (Add a regression test for issue-63355) - #86814 (Recover from a misplaced inner doc comment) - #86843 (Check that const parameters of trait methods have compatible types) - #86889 (rustdoc: Cleanup ExternalCrate) - #87092 (Remove nondeterminism in multiple-definitions test) - #87170 (Add diagnostic items for Clippy) - #87183 (fix typo in compile_fail doctest) - #87205 (rustc_middle: remove redundant clone) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/lib.rs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/compiler/rustc_codegen_llvm/src/lib.rs b/compiler/rustc_codegen_llvm/src/lib.rs index 26fd1cfbcd0..aa4db1622b2 100644 --- a/compiler/rustc_codegen_llvm/src/lib.rs +++ b/compiler/rustc_codegen_llvm/src/lib.rs @@ -292,9 +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); - - Ok(()) + link_binary::<LlvmArchiveBuilder<'_>>(sess, &codegen_results, outputs) } } |