More lifetime renaming.

Author: nnethercote

compiler/rustc_mir_dataflow/src/move_paths/builder.rs

@@ -14,17 +14,17 @@ use super::{
     MoveOutIndex, MovePath, MovePathIndex, MovePathLookup,
 };
 
-struct MoveDataBuilder<'a, 'tcx, F> {
-    body: &'a Body<'tcx>,
+struct MoveDataBuilder<'mir, 'tcx, F> {
+    body: &'mir Body<'tcx>,
     tcx: TyCtxt<'tcx>,
     param_env: ty::ParamEnv<'tcx>,
     data: MoveData<'tcx>,
     filter: F,
 }
 
-impl<'a, 'tcx, F: Fn(Ty<'tcx>) -> bool> MoveDataBuilder<'a, 'tcx, F> {
+impl<'mir, 'tcx, F: Fn(Ty<'tcx>) -> bool> MoveDataBuilder<'mir, 'tcx, F> {
     fn new(
-        body: &'a Body<'tcx>,
+        body: &'mir Body<'tcx>,
         tcx: TyCtxt<'tcx>,
         param_env: ty::ParamEnv<'tcx>,
         filter: F,
@@ -107,7 +107,7 @@ enum MovePathResult {
     Error,
 }
 
-impl<'b, 'a, 'tcx, F: Fn(Ty<'tcx>) -> bool> Gatherer<'b, 'a, 'tcx, F> {
+impl<'a, 'mir, 'tcx, F: Fn(Ty<'tcx>) -> bool> Gatherer<'a, 'mir, 'tcx, F> {
     /// This creates a MovePath for a given place, returning an `MovePathError`
     /// if that place can't be moved from.
     ///
@@ -287,7 +287,7 @@ impl<'b, 'a, 'tcx, F: Fn(Ty<'tcx>) -> bool> Gatherer<'b, 'a, 'tcx, F> {
     }
 }
 
-impl<'a, 'tcx, F> MoveDataBuilder<'a, 'tcx, F> {
+impl<'mir, 'tcx, F> MoveDataBuilder<'mir, 'tcx, F> {
     fn finalize(self) -> MoveData<'tcx> {
         debug!("{}", {
             debug!("moves for {:?}:", self.body.span);
@@ -328,7 +328,7 @@ pub(super) fn gather_moves<'tcx>(
     builder.finalize()
 }
 
-impl<'a, 'tcx, F: Fn(Ty<'tcx>) -> bool> MoveDataBuilder<'a, 'tcx, F> {
+impl<'mir, 'tcx, F: Fn(Ty<'tcx>) -> bool> MoveDataBuilder<'mir, 'tcx, F> {
     fn gather_args(&mut self) {
         for arg in self.body.args_iter() {
             if let Some(path) = self.data.rev_lookup.find_local(arg) {
@@ -356,12 +356,12 @@ impl<'a, 'tcx, F: Fn(Ty<'tcx>) -> bool> MoveDataBuilder<'a, 'tcx, F> {
     }
 }
 
-struct Gatherer<'b, 'a, 'tcx, F> {
-    builder: &'b mut MoveDataBuilder<'a, 'tcx, F>,
+struct Gatherer<'a, 'mir, 'tcx, F> {
+    builder: &'a mut MoveDataBuilder<'mir, 'tcx, F>,
     loc: Location,
 }
 
-impl<'b, 'a, 'tcx, F: Fn(Ty<'tcx>) -> bool> Gatherer<'b, 'a, 'tcx, F> {
+impl<'a, 'mir, 'tcx, F: Fn(Ty<'tcx>) -> bool> Gatherer<'a, 'mir, 'tcx, F> {
     fn gather_statement(&mut self, stmt: &Statement<'tcx>) {
         match &stmt.kind {
             StatementKind::Assign(box (place, Rvalue::CopyForDeref(reffed))) => {