nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-16 17:03:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename some lifetimes.

Browse Source 
Giving them more typical names.
This commit is contained in:
Nicholas Nethercote 2024-09-10 12:01:42 +10:00
parent 072bf482c9
commit 606b9cb406
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
compiler/rustc_borrowck/src/type_check/relate_tys.rs
View File

@ -58,8 +58,8 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
} }
} }
struct NllTypeRelating<'me, 'bccx, 'tcx> { struct NllTypeRelating<'a, 'b, 'tcx> {
type_checker: &'me mut TypeChecker<'bccx, 'tcx>, type_checker: &'a mut TypeChecker<'b, 'tcx>,
/// Where (and why) is this relation taking place? /// Where (and why) is this relation taking place?
locations: Locations, locations: Locations,
@ -82,9 +82,9 @@ struct NllTypeRelating<'me, 'bccx, 'tcx> {
ambient_variance_info: ty::VarianceDiagInfo<TyCtxt<'tcx>>, ambient_variance_info: ty::VarianceDiagInfo<TyCtxt<'tcx>>,
} }
impl<'me, 'bccx, 'tcx> NllTypeRelating<'me, 'bccx, 'tcx> { impl<'a, 'b, 'tcx> NllTypeRelating<'a, 'b, 'tcx> {
fn new( fn new(
type_checker: &'me mut TypeChecker<'bccx, 'tcx>, type_checker: &'a mut TypeChecker<'b, 'tcx>,
locations: Locations, locations: Locations,
category: ConstraintCategory<'tcx>, category: ConstraintCategory<'tcx>,
universe_info: UniverseInfo<'tcx>, universe_info: UniverseInfo<'tcx>,
@ -309,7 +309,7 @@ impl<'me, 'bccx, 'tcx> NllTypeRelating<'me, 'bccx, 'tcx> {
} }
} }
impl<'bccx, 'tcx> TypeRelation<TyCtxt<'tcx>> for NllTypeRelating<'_, 'bccx, 'tcx> { impl<'b, 'tcx> TypeRelation<TyCtxt<'tcx>> for NllTypeRelating<'_, 'b, 'tcx> {
fn cx(&self) -> TyCtxt<'tcx> { fn cx(&self) -> TyCtxt<'tcx> {
self.type_checker.infcx.tcx self.type_checker.infcx.tcx
} }
@ -520,7 +520,7 @@ impl<'bccx, 'tcx> TypeRelation<TyCtxt<'tcx>> for NllTypeRelating<'_, 'bccx, 'tcx
} }
} }
impl<'bccx, 'tcx> PredicateEmittingRelation<InferCtxt<'tcx>> for NllTypeRelating<'_, 'bccx, 'tcx> { impl<'b, 'tcx> PredicateEmittingRelation<InferCtxt<'tcx>> for NllTypeRelating<'_, 'b, 'tcx> {
fn span(&self) -> Span { fn span(&self) -> Span {
self.locations.span(self.type_checker.body) self.locations.span(self.type_checker.body)
} }

6
compiler/rustc_mir_dataflow/src/elaborate_drops.rs
View File

@ -155,11 +155,11 @@ pub trait DropElaborator<'a, 'tcx>: fmt::Debug {
} }
#[derive(Debug)] #[derive(Debug)]
struct DropCtxt<'l, 'b, 'tcx, D> struct DropCtxt<'a, 'b, 'tcx, D>
where where
D: DropElaborator<'b, 'tcx>, D: DropElaborator<'b, 'tcx>,
{ {
elaborator: &'l mut D, elaborator: &'a mut D,
source_info: SourceInfo, source_info: SourceInfo,
@ -192,7 +192,7 @@ pub fn elaborate_drop<'b, 'tcx, D>(
DropCtxt { elaborator, source_info, place, path, succ, unwind }.elaborate_drop(bb) DropCtxt { elaborator, source_info, place, path, succ, unwind }.elaborate_drop(bb)
} }
impl<'l, 'b, 'tcx, D> DropCtxt<'l, 'b, 'tcx, D> impl<'a, 'b, 'tcx, D> DropCtxt<'a, 'b, 'tcx, D>
where where
D: DropElaborator<'b, 'tcx>, D: DropElaborator<'b, 'tcx>,
'tcx: 'b, 'tcx: 'b,