Skip to content

Commit 3ec2f12

Browse files
committed
Rename some lifetimes.
`'mir` is not a good lifetime name in `LocalAnalyzer`, because it's used on two unrelated fields. `'a` is more standard for a situation like this (e.g. #130022).
1 parent ae1f092 commit 3ec2f12

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

Diff for: compiler/rustc_codegen_ssa/src/mir/analyze.rs

+5-7
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,13 @@ enum LocalKind {
6969
SSA(DefLocation),
7070
}
7171

72-
struct LocalAnalyzer<'mir, 'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> {
73-
fx: &'mir FunctionCx<'a, 'tcx, Bx>,
74-
dominators: &'mir Dominators<mir::BasicBlock>,
72+
struct LocalAnalyzer<'a, 'b, 'tcx, Bx: BuilderMethods<'b, 'tcx>> {
73+
fx: &'a FunctionCx<'b, 'tcx, Bx>,
74+
dominators: &'a Dominators<mir::BasicBlock>,
7575
locals: IndexVec<mir::Local, LocalKind>,
7676
}
7777

78-
impl<'mir, 'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> LocalAnalyzer<'mir, 'a, 'tcx, Bx> {
78+
impl<'a, 'b, 'tcx, Bx: BuilderMethods<'b, 'tcx>> LocalAnalyzer<'a, 'b, 'tcx, Bx> {
7979
fn define(&mut self, local: mir::Local, location: DefLocation) {
8080
let kind = &mut self.locals[local];
8181
match *kind {
@@ -152,9 +152,7 @@ impl<'mir, 'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> LocalAnalyzer<'mir, 'a, 'tcx,
152152
}
153153
}
154154

155-
impl<'mir, 'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> Visitor<'tcx>
156-
for LocalAnalyzer<'mir, 'a, 'tcx, Bx>
157-
{
155+
impl<'a, 'b, 'tcx, Bx: BuilderMethods<'b, 'tcx>> Visitor<'tcx> for LocalAnalyzer<'a, 'b, 'tcx, Bx> {
158156
fn visit_assign(
159157
&mut self,
160158
place: &mir::Place<'tcx>,

0 commit comments

Comments
 (0)