diff options
| author | Eduard-Mihai Burtescu <edy.burt@gmail.com> | 2019-06-11 23:47:08 +0300 |
|---|---|---|
| committer | Eduard-Mihai Burtescu <edy.burt@gmail.com> | 2019-06-12 13:38:27 +0300 |
| commit | 17cdd356da598eb46515352277d3664f05c888ee (patch) | |
| tree | c3bfa4d9040a2407737363cbe5ab9d6a99b2c67a /src/librustc_interface | |
| parent | 244125350880ca2f905928cae4115867eedd301a (diff) | |
rustc: replace `TyCtxt<'tcx, 'gcx, 'tcx>` with `TyCtxt<'gcx, 'tcx>`.
Diffstat (limited to 'src/librustc_interface')
| -rw-r--r-- | src/librustc_interface/passes.rs | 8 | ||||
| -rw-r--r-- | src/librustc_interface/proc_macro_decls.rs | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/librustc_interface/passes.rs b/src/librustc_interface/passes.rs index 66a4ee8bfc3..2fc78dcddd0 100644 --- a/src/librustc_interface/passes.rs +++ b/src/librustc_interface/passes.rs @@ -798,7 +798,7 @@ declare_box_region_type!( impl BoxedGlobalCtxt { pub fn enter<F, R>(&mut self, f: F) -> R where - F: for<'tcx> FnOnce(TyCtxt<'tcx, 'tcx, 'tcx>) -> R + F: for<'tcx> FnOnce(TyCtxt<'tcx, 'tcx>) -> R { self.access(|gcx| ty::tls::enter_global(gcx, |tcx| f(tcx))) } @@ -879,7 +879,7 @@ pub fn create_global_ctxt( /// Runs the resolution, type-checking, region checking and other /// miscellaneous analysis passes on the crate. fn analysis<'tcx>( - tcx: TyCtxt<'tcx, 'tcx, 'tcx>, + tcx: TyCtxt<'tcx, 'tcx>, cnum: CrateNum, ) -> Result<()> { assert_eq!(cnum, LOCAL_CRATE); @@ -999,7 +999,7 @@ fn analysis<'tcx>( } fn encode_and_write_metadata<'tcx>( - tcx: TyCtxt<'tcx, 'tcx, 'tcx>, + tcx: TyCtxt<'tcx, 'tcx>, outputs: &OutputFilenames, ) -> (middle::cstore::EncodedMetadata, bool) { #[derive(PartialEq, Eq, PartialOrd, Ord)] @@ -1062,7 +1062,7 @@ fn encode_and_write_metadata<'tcx>( /// be discarded. pub fn start_codegen<'tcx>( codegen_backend: &dyn CodegenBackend, - tcx: TyCtxt<'tcx, 'tcx, 'tcx>, + tcx: TyCtxt<'tcx, 'tcx>, rx: mpsc::Receiver<Box<dyn Any + Send>>, outputs: &OutputFilenames, ) -> Box<dyn Any> { diff --git a/src/librustc_interface/proc_macro_decls.rs b/src/librustc_interface/proc_macro_decls.rs index 82eb2014728..864b59d8a84 100644 --- a/src/librustc_interface/proc_macro_decls.rs +++ b/src/librustc_interface/proc_macro_decls.rs @@ -6,12 +6,12 @@ use rustc::ty::query::Providers; use syntax::attr; use syntax::symbol::sym; -pub fn find<'tcx>(tcx: TyCtxt<'tcx, 'tcx, 'tcx>) -> Option<DefId> { +pub fn find<'tcx>(tcx: TyCtxt<'tcx, 'tcx>) -> Option<DefId> { tcx.proc_macro_decls_static(LOCAL_CRATE) } fn proc_macro_decls_static<'tcx>( - tcx: TyCtxt<'tcx, 'tcx, 'tcx>, + tcx: TyCtxt<'tcx, 'tcx>, cnum: CrateNum, ) -> Option<DefId> { assert_eq!(cnum, LOCAL_CRATE); |
