diff options
| author | bors <bors@rust-lang.org> | 2024-08-25 08:12:16 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-08-25 08:12:16 +0000 |
| commit | 717aec0f8eebdc5eb51756e5129dde15e8b25710 (patch) | |
| tree | 1b6387c8512783fda7b7810ce7bd7091aa0ff7ea /compiler/rustc_codegen_ssa/src | |
| parent | 697d9530d78aeba31458cadfc338adb2aea90bee (diff) | |
| parent | e664ff5d8cdc8672955475c47b049a2844950167 (diff) | |
| download | rust-717aec0f8eebdc5eb51756e5129dde15e8b25710.tar.gz rust-717aec0f8eebdc5eb51756e5129dde15e8b25710.zip | |
Auto merge of #129521 - matthiaskrgr:rollup-uigv77m, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #128596 (stabilize const_fn_floating_point_arithmetic) - #129199 (make writes_through_immutable_pointer a hard error) - #129246 (Retroactively feature gate `ConstArgKind::Path`) - #129290 (Pin `cc` to 1.0.105) - #129323 (Implement `ptr::fn_addr_eq`) - #129500 (remove invalid `TyCompat` relation for effects) - #129501 (panicking: improve hint for Miri's RUST_BACKTRACE behavior) - #129505 (interpret: ImmTy: tighten sanity checks in offset logic) - #129510 (Fix `elided_named_lifetimes` in code) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_ssa/src')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/back/archive.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_ssa/src/back/archive.rs b/compiler/rustc_codegen_ssa/src/back/archive.rs index c8c1bd3e8f9..76a94de5433 100644 --- a/compiler/rustc_codegen_ssa/src/back/archive.rs +++ b/compiler/rustc_codegen_ssa/src/back/archive.rs @@ -125,7 +125,7 @@ pub trait ArchiveBuilderBuilder { rlib: &'a Path, outdir: &Path, bundled_lib_file_names: &FxIndexSet<Symbol>, - ) -> Result<(), ExtractBundledLibsError<'_>> { + ) -> Result<(), ExtractBundledLibsError<'a>> { let archive_map = unsafe { Mmap::map( File::open(rlib) |