bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Use ops::ControlFlow in graph::iterate

Browse source
This commit is contained in:
Scott McMurray 2020-09-04 00:59:41 -07:00
parent 0d0f6b1130
commit fac272688e
7 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
compiler/rustc_mir_build/src/lib.rs
View file

@ -6,6 +6,7 @@
#![feature(box_syntax)]
#![feature(const_fn)]
#![feature(const_panic)]
#![feature(control_flow_enum)]
#![feature(crate_visibility_modifier)]
#![feature(bool_to_option)]
#![feature(or_patterns)]

6
compiler/rustc_mir_build/src/lints.rs
View file

@ -117,7 +117,7 @@ impl<'mir, 'tcx> TriColorVisitor<&'mir Body<'tcx>> for Search<'mir, 'tcx> {
// A diverging InlineAsm is treated as non-recursing
TerminatorKind::InlineAsm { destination, .. } => {
if destination.is_some() {
ControlFlow::Continue
ControlFlow::CONTINUE
} else {
ControlFlow::Break(NonRecursive)
}
@ -131,7 +131,7 @@ impl<'mir, 'tcx> TriColorVisitor<&'mir Body<'tcx>> for Search<'mir, 'tcx> {
| TerminatorKind::FalseEdge { .. }
| TerminatorKind::FalseUnwind { .. }
| TerminatorKind::Goto { .. }
| TerminatorKind::SwitchInt { .. } => ControlFlow::Continue,
| TerminatorKind::SwitchInt { .. } => ControlFlow::CONTINUE,
}
}
@ -144,7 +144,7 @@ impl<'mir, 'tcx> TriColorVisitor<&'mir Body<'tcx>> for Search<'mir, 'tcx> {
}
}
ControlFlow::Continue
ControlFlow::CONTINUE
}
fn ignore_edge(&mut self, bb: BasicBlock, target: BasicBlock) -> bool {