diff options
| author | bors <bors@rust-lang.org> | 2024-07-31 15:24:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-07-31 15:24:45 +0000 |
| commit | 99322d84c4e216940621c356787331d8ae362326 (patch) | |
| tree | c17364c07ab235b5fea4d6f3057544d3ddd145ed /compiler/rustc_codegen_llvm/src | |
| parent | 0b5eb7ba7bd796fb39c8bb6acd9ef6c140f28b65 (diff) | |
| parent | 031093f24bbf8860b9bea0204932517b6ae38d5d (diff) | |
| download | rust-99322d84c4e216940621c356787331d8ae362326.tar.gz rust-99322d84c4e216940621c356787331d8ae362326.zip | |
Auto merge of #128435 - matthiaskrgr:rollup-l76vu3i, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #126454 (bump-stage0: use IndexMap for determinism) - #127681 (derive(SmartPointer): rewrite bounds in where and generic bounds) - #127830 (When an archive fails to build, print the path) - #128151 (Structured suggestion for `extern crate foo` when `foo` isn't resolved in import) - #128387 (More detailed note to deprecate ONCE_INIT) - #128388 (Match LLVM ABI in `extern "C"` functions for `f128` on Windows) - #128402 (Attribute checking simplifications) - #128412 (Remove `crate_level_only` from `ELIDED_LIFETIMES_IN_PATHS`) - #128430 (Use a separate pattern type for `rustc_pattern_analysis` diagnostics ) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/back/archive.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_llvm/src/back/archive.rs b/compiler/rustc_codegen_llvm/src/back/archive.rs index 9a28428cb62..2f5a864d70e 100644 --- a/compiler/rustc_codegen_llvm/src/back/archive.rs +++ b/compiler/rustc_codegen_llvm/src/back/archive.rs @@ -97,7 +97,9 @@ impl<'a> ArchiveBuilder for LlvmArchiveBuilder<'a> { fn build(mut self: Box<Self>, output: &Path) -> bool { match self.build_with_llvm(output) { Ok(any_members) => any_members, - Err(e) => self.sess.dcx().emit_fatal(ArchiveBuildFailure { error: e }), + Err(error) => { + self.sess.dcx().emit_fatal(ArchiveBuildFailure { path: output.to_owned(), error }) + } } } } |
