diff options
| author | Gabriela Alexandra Moldovan <gabi_250@live.com> | 2019-03-04 16:56:57 +0000 |
|---|---|---|
| committer | Gabriela Alexandra Moldovan <gabi_250@live.com> | 2019-03-04 23:49:04 +0000 |
| commit | cd9a0cf53776cc2b36898a530d20b6046875a510 (patch) | |
| tree | adad83c589f11234c66292e41d1e2fb9ce4e5e3e | |
| parent | a9da8fc9c267c08cfdb8cf5b39da14f154d12939 (diff) | |
| download | rust-cd9a0cf53776cc2b36898a530d20b6046875a510.tar.gz rust-cd9a0cf53776cc2b36898a530d20b6046875a510.zip | |
Make the lifetime parameters of tcx consistent.
| -rw-r--r-- | src/librustc_codegen_llvm/lib.rs | 4 | ||||
| -rw-r--r-- | src/librustc_codegen_ssa/traits/backend.rs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/librustc_codegen_llvm/lib.rs b/src/librustc_codegen_llvm/lib.rs index 5b8c7461bcb..258391ba836 100644 --- a/src/librustc_codegen_llvm/lib.rs +++ b/src/librustc_codegen_llvm/lib.rs @@ -123,9 +123,9 @@ impl ExtraBackendMethods for LlvmCodegenBackend { ) -> EncodedMetadata { base::write_metadata(tcx, metadata) } - fn codegen_allocator( + fn codegen_allocator<'b, 'gcx>( &self, - tcx: TyCtxt<'_, '_, '_>, + tcx: TyCtxt<'b, 'gcx, 'gcx>, mods: &mut ModuleLlvm, kind: AllocatorKind ) { diff --git a/src/librustc_codegen_ssa/traits/backend.rs b/src/librustc_codegen_ssa/traits/backend.rs index 00eae9098e7..a9e0eadb198 100644 --- a/src/librustc_codegen_ssa/traits/backend.rs +++ b/src/librustc_codegen_ssa/traits/backend.rs @@ -38,9 +38,9 @@ pub trait ExtraBackendMethods: CodegenBackend + WriteBackendMethods + Sized + Se tcx: TyCtxt<'b, 'gcx, 'gcx>, metadata: &mut Self::Module, ) -> EncodedMetadata; - fn codegen_allocator( + fn codegen_allocator<'b, 'gcx>( &self, - tcx: TyCtxt<'_, '_, '_>, + tcx: TyCtxt<'b, 'gcx, 'gcx>, mods: &mut Self::Module, kind: AllocatorKind ); |