Skip to content

Commit 6c5345f

Browse files
committed
fmt; make visit_terminator arg names consistent with the rest
1 parent 046165a commit 6c5345f

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

src/librustc_middle/mir/visit.rs

+19-19
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ macro_rules! make_mir_visitor {
407407

408408
fn super_terminator(&mut self,
409409
terminator: &$($mutability)? Terminator<'tcx>,
410-
source_location: Location) {
410+
location: Location) {
411411
let Terminator { source_info, kind } = terminator;
412412

413413
self.visit_source_info(source_info);
@@ -428,7 +428,7 @@ macro_rules! make_mir_visitor {
428428
self.visit_local(
429429
& $($mutability)? local,
430430
PlaceContext::NonMutatingUse(NonMutatingUseContext::Move),
431-
source_location,
431+
location,
432432
);
433433

434434
assert_eq!(
@@ -444,8 +444,8 @@ macro_rules! make_mir_visitor {
444444
values: _,
445445
targets: _
446446
} => {
447-
self.visit_operand(discr, source_location);
448-
self.visit_ty(switch_ty, TyContext::Location(source_location));
447+
self.visit_operand(discr, location);
448+
self.visit_ty(switch_ty, TyContext::Location(location));
449449
}
450450

451451
TerminatorKind::Drop {
@@ -456,7 +456,7 @@ macro_rules! make_mir_visitor {
456456
self.visit_place(
457457
place,
458458
PlaceContext::MutatingUse(MutatingUseContext::Drop),
459-
source_location
459+
location
460460
);
461461
}
462462

@@ -469,9 +469,9 @@ macro_rules! make_mir_visitor {
469469
self.visit_place(
470470
place,
471471
PlaceContext::MutatingUse(MutatingUseContext::Drop),
472-
source_location
472+
location
473473
);
474-
self.visit_operand(value, source_location);
474+
self.visit_operand(value, location);
475475
}
476476

477477
TerminatorKind::Call {
@@ -482,15 +482,15 @@ macro_rules! make_mir_visitor {
482482
from_hir_call: _,
483483
fn_span: _
484484
} => {
485-
self.visit_operand(func, source_location);
485+
self.visit_operand(func, location);
486486
for arg in args {
487-
self.visit_operand(arg, source_location);
487+
self.visit_operand(arg, location);
488488
}
489489
if let Some((destination, _)) = destination {
490490
self.visit_place(
491491
destination,
492492
PlaceContext::MutatingUse(MutatingUseContext::Call),
493-
source_location
493+
location
494494
);
495495
}
496496
}
@@ -502,8 +502,8 @@ macro_rules! make_mir_visitor {
502502
target: _,
503503
cleanup: _,
504504
} => {
505-
self.visit_operand(cond, source_location);
506-
self.visit_assert_message(msg, source_location);
505+
self.visit_operand(cond, location);
506+
self.visit_assert_message(msg, location);
507507
}
508508

509509
TerminatorKind::Yield {
@@ -512,11 +512,11 @@ macro_rules! make_mir_visitor {
512512
resume_arg,
513513
drop: _,
514514
} => {
515-
self.visit_operand(value, source_location);
515+
self.visit_operand(value, location);
516516
self.visit_place(
517517
resume_arg,
518518
PlaceContext::MutatingUse(MutatingUseContext::Yield),
519-
source_location,
519+
location,
520520
);
521521
}
522522

@@ -531,29 +531,29 @@ macro_rules! make_mir_visitor {
531531
match op {
532532
InlineAsmOperand::In { value, .. }
533533
| InlineAsmOperand::Const { value } => {
534-
self.visit_operand(value, source_location);
534+
self.visit_operand(value, location);
535535
}
536536
InlineAsmOperand::Out { place, .. } => {
537537
if let Some(place) = place {
538538
self.visit_place(
539539
place,
540540
PlaceContext::MutatingUse(MutatingUseContext::Store),
541-
source_location,
541+
location,
542542
);
543543
}
544544
}
545545
InlineAsmOperand::InOut { in_value, out_place, .. } => {
546-
self.visit_operand(in_value, source_location);
546+
self.visit_operand(in_value, location);
547547
if let Some(out_place) = out_place {
548548
self.visit_place(
549549
out_place,
550550
PlaceContext::MutatingUse(MutatingUseContext::Store),
551-
source_location,
551+
location,
552552
);
553553
}
554554
}
555555
InlineAsmOperand::SymFn { value } => {
556-
self.visit_constant(value, source_location);
556+
self.visit_constant(value, location);
557557
}
558558
InlineAsmOperand::SymStatic { def_id: _ } => {}
559559
}

0 commit comments

Comments
 (0)