user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use visit_terminator_kind when possible

Browse source
This commit is contained in:
Matthew Jasper 2019-04-22 21:08:52 +01:00
parent 0eeab6b9a6
commit 7ab92cde55
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/librustc_mir/borrow_check/nll/invalidation.rs
View file

@ -14,7 +14,7 @@ use rustc::ty::TyCtxt;
use rustc::mir::visit::Visitor;
use rustc::mir::{BasicBlock, Location, Mir, Place, PlaceBase, Rvalue};
use rustc::mir::{Statement, StatementKind};
use rustc::mir::{Terminator, TerminatorKind};
use rustc::mir::TerminatorKind;
use rustc::mir::{Operand, BorrowKind};
use rustc_data_structures::graph::dominators::Dominators;
@ -136,14 +136,14 @@ impl<'cx, 'tcx, 'gcx> Visitor<'tcx> for InvalidationGenerator<'cx, 'tcx, 'gcx> {
self.super_statement(statement, location);
}
fn visit_terminator(
fn visit_terminator_kind(
&mut self,
kind: &Terminator<'tcx>,
kind: &TerminatorKind<'tcx>,
location: Location
) {
self.check_activations(location);
match terminator.kind {
match kind {
TerminatorKind::SwitchInt {
ref discr,
switch_ty: _,
@ -256,7 +256,7 @@ impl<'cx, 'tcx, 'gcx> Visitor<'tcx> for InvalidationGenerator<'cx, 'tcx, 'gcx> {
}
}
self.super_terminator(terminator, location);
self.super_terminator_kind(kind, location);
}
}

8
src/librustc_mir/transform/no_landing_pads.rs
View file

@ -24,12 +24,12 @@ pub fn no_landing_pads<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, mir: &mut Mir<'tcx
}
impl<'tcx> MutVisitor<'tcx> for NoLandingPads {
fn visit_terminator(&mut self,
terminator: &mut Terminator<'tcx>,
fn visit_terminator_kind(&mut self,
kind: &mut TerminatorKind<'tcx>,
location: Location) {
if let Some(unwind) = terminator.kind.unwind_mut() {
if let Some(unwind) = kind.unwind_mut() {
unwind.take();
}
self.super_terminator(terminator, location);
self.super_terminator_kind(kind, location);
}
}