diff options
| author | Eduard-Mihai Burtescu <edy.burt@gmail.com> | 2019-06-16 12:33:47 +0300 |
|---|---|---|
| committer | Eduard-Mihai Burtescu <edy.burt@gmail.com> | 2019-06-18 18:10:26 +0300 |
| commit | 4c4fc7512eff62f5cc63a1a30f4474db003884c9 (patch) | |
| tree | 92c659f2e003119d2f7e1799a35e930c1eb071bf /src/librustc_codegen_ssa | |
| parent | 356a37d8d1e9c62481970c36ef45fe7f4f936549 (diff) | |
| download | rust-4c4fc7512eff62f5cc63a1a30f4474db003884c9.tar.gz rust-4c4fc7512eff62f5cc63a1a30f4474db003884c9.zip | |
rustc: reintroduce lifetime bounds where necessary.
Diffstat (limited to 'src/librustc_codegen_ssa')
| -rw-r--r-- | src/librustc_codegen_ssa/base.rs | 2 | ||||
| -rw-r--r-- | src/librustc_codegen_ssa/mono_item.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_codegen_ssa/base.rs b/src/librustc_codegen_ssa/base.rs index a06f324d389..ba96865d23b 100644 --- a/src/librustc_codegen_ssa/base.rs +++ b/src/librustc_codegen_ssa/base.rs @@ -366,7 +366,7 @@ pub fn memcpy_ty<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>>( bx.memcpy(dst, dst_align, src, src_align, bx.cx().const_usize(size), flags); } -pub fn codegen_instance<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>>( +pub fn codegen_instance<'a, 'tcx: 'a, Bx: BuilderMethods<'a, 'tcx>>( cx: &'a Bx::CodegenCx, instance: Instance<'tcx>, ) { diff --git a/src/librustc_codegen_ssa/mono_item.rs b/src/librustc_codegen_ssa/mono_item.rs index 57bd2f36dd7..4446f1a3a5c 100644 --- a/src/librustc_codegen_ssa/mono_item.rs +++ b/src/librustc_codegen_ssa/mono_item.rs @@ -17,7 +17,7 @@ pub trait MonoItemExt<'a, 'tcx> { fn to_raw_string(&self) -> String; } -impl<'a, 'tcx> MonoItemExt<'a, 'tcx> for MonoItem<'tcx> { +impl<'a, 'tcx: 'a> MonoItemExt<'a, 'tcx> for MonoItem<'tcx> { fn define<Bx: BuilderMethods<'a, 'tcx>>(&self, cx: &'a Bx::CodegenCx) { debug!("BEGIN IMPLEMENTING '{} ({})' in cgu {}", self.to_string(cx.tcx(), true), |
