diff options
| author | The Miri Conjob Bot <miri@cron.bot> | 2024-02-29 05:02:18 +0000 |
|---|---|---|
| committer | The Miri Conjob Bot <miri@cron.bot> | 2024-02-29 05:02:18 +0000 |
| commit | 1b41d791f94c7f4b478a317667405ba7e17aa501 (patch) | |
| tree | 18ad46d4d5135068609a49a284100effdd5d6724 /compiler/rustc_codegen_llvm/src/back/archive.rs | |
| parent | f43c07c037f64791c6d2a7c69088bd7312454bf2 (diff) | |
| parent | 607bf653c2bed1ec3f7979d9511f3c9cef604bc3 (diff) | |
| download | rust-1b41d791f94c7f4b478a317667405ba7e17aa501.tar.gz rust-1b41d791f94c7f4b478a317667405ba7e17aa501.zip | |
Merge from rustc
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 { |