Rollup merge of #107398 - scottmcm:its-their-funeral, r=dtolnay

Remove `ControlFlow::{BREAK, CONTINUE}`

Libs-API decided to remove these in #102697.

Follow-up to #107023, which removed them from `compiler/`, but a couple new ones showed up since that was merged.

r? libs
This commit is contained in:
Matthias Krüger 2023-01-28 11:11:09 +01:00 committed by GitHub
commit a493717718
5 changed files with 3 additions and 5 deletions

View File

@ -1,7 +1,6 @@
#![feature(array_windows)] #![feature(array_windows)]
#![feature(binary_heap_into_iter_sorted)] #![feature(binary_heap_into_iter_sorted)]
#![feature(box_patterns)] #![feature(box_patterns)]
#![feature(control_flow_enum)]
#![feature(drain_filter)] #![feature(drain_filter)]
#![feature(iter_intersperse)] #![feature(iter_intersperse)]
#![feature(let_chains)] #![feature(let_chains)]

View File

@ -54,7 +54,7 @@ fn collect_replace_calls<'tcx>(
from_args.push_front(from); from_args.push_front(from);
ControlFlow::Continue(()) ControlFlow::Continue(())
} else { } else {
ControlFlow::BREAK ControlFlow::Break(())
} }
} else { } else {
ControlFlow::Continue(()) ControlFlow::Continue(())

View File

@ -1,6 +1,5 @@
#![feature(array_chunks)] #![feature(array_chunks)]
#![feature(box_patterns)] #![feature(box_patterns)]
#![feature(control_flow_enum)]
#![feature(let_chains)] #![feature(let_chains)]
#![feature(lint_reasons)] #![feature(lint_reasons)]
#![feature(never_type)] #![feature(never_type)]

View File

@ -327,7 +327,7 @@ fn is_assert_arg(cx: &LateContext<'_>, expr: &Expr<'_>, assert_expn: ExpnId) ->
} else { } else {
match cx.tcx.item_name(macro_call.def_id) { match cx.tcx.item_name(macro_call.def_id) {
// `cfg!(debug_assertions)` in `debug_assert!` // `cfg!(debug_assertions)` in `debug_assert!`
sym::cfg => ControlFlow::CONTINUE, sym::cfg => ControlFlow::Continue(()),
// assert!(other_macro!(..)) // assert!(other_macro!(..))
_ => ControlFlow::Break(true), _ => ControlFlow::Break(true),
} }

View File

@ -140,7 +140,7 @@ impl TypeVisitor<'_> for ContainsRegion {
type BreakTy = (); type BreakTy = ();
fn visit_region(&mut self, _: ty::Region<'_>) -> ControlFlow<Self::BreakTy> { fn visit_region(&mut self, _: ty::Region<'_>) -> ControlFlow<Self::BreakTy> {
ControlFlow::BREAK ControlFlow::Break(())
} }
} }