diff options
| author | bors <bors@rust-lang.org> | 2024-02-29 11:25:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-02-29 11:25:45 +0000 |
| commit | 5717e52d173f2cc9919900d0013e0e3eeb4afa2c (patch) | |
| tree | 18ad46d4d5135068609a49a284100effdd5d6724 /compiler/rustc_codegen_llvm/src/back/archive.rs | |
| parent | d79a5ed90459b2ad382c974f5cdadb5ab586c75d (diff) | |
| parent | 1b41d791f94c7f4b478a317667405ba7e17aa501 (diff) | |
| download | rust-5717e52d173f2cc9919900d0013e0e3eeb4afa2c.tar.gz rust-5717e52d173f2cc9919900d0013e0e3eeb4afa2c.zip | |
Auto merge of #3335 - rust-lang:rustup-2024-02-29, r=saethlin
Automatic Rustup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/back/archive.rs')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/back/archive.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_llvm/src/back/archive.rs b/compiler/rustc_codegen_llvm/src/back/archive.rs index b6bbc81732e..ca43ac4b0e7 100644 --- a/compiler/rustc_codegen_llvm/src/back/archive.rs +++ b/compiler/rustc_codegen_llvm/src/back/archive.rs @@ -60,7 +60,7 @@ fn llvm_machine_type(cpu: &str) -> LLVMMachineType { } } -impl<'a> ArchiveBuilder<'a> for LlvmArchiveBuilder<'a> { +impl<'a> ArchiveBuilder for LlvmArchiveBuilder<'a> { fn add_archive( &mut self, archive: &Path, @@ -107,7 +107,7 @@ impl<'a> ArchiveBuilder<'a> for LlvmArchiveBuilder<'a> { pub struct LlvmArchiveBuilderBuilder; impl ArchiveBuilderBuilder for LlvmArchiveBuilderBuilder { - fn new_archive_builder<'a>(&self, sess: &'a Session) -> Box<dyn ArchiveBuilder<'a> + 'a> { + fn new_archive_builder<'a>(&self, sess: &'a Session) -> Box<dyn ArchiveBuilder + 'a> { // FIXME use ArArchiveBuilder on most targets again once reading thin archives is // implemented if true { |