Remove from librustdoc and clippy too

src/librustdoc/html/length_limit.rs

@@ -61,14 +61,14 @@ impl HtmlWithLimit {
  /// and returns [`ControlFlow::Break`].
  pub(super) fn push(&mut self, text: &str) -> ControlFlow<(), ()> {
  if self.len + text.len() > self.limit {
- return ControlFlow::BREAK;
+ return ControlFlow::Break(());
  }
 
  self.flush_queue();
  write!(self.buf, "{}", Escape(text)).unwrap();
  self.len += text.len();
 
- ControlFlow::CONTINUE
+ ControlFlow::Continue(())
  }
 
  /// Open an HTML tag.

src/librustdoc/html/length_limit/tests.rs

@@ -83,7 +83,7 @@ fn past_the_limit() {
  buf.push("word#")?;
  buf.push(&n.to_string())?;
  buf.close_tag();
- ControlFlow::CONTINUE
+ ControlFlow::Continue(())
  });
  buf.close_tag();
  assert_eq!(

src/librustdoc/html/markdown.rs

@@ -1188,18 +1188,18 @@ fn markdown_summary_with_limit(
  Event::Start(tag) => match tag {
  Tag::Emphasis => buf.open_tag("em"),
  Tag::Strong => buf.open_tag("strong"),
- Tag::CodeBlock(..) => return ControlFlow::BREAK,
+ Tag::CodeBlock(..) => return ControlFlow::Break(()),
  _ => {}
  },
  Event::End(tag) => match tag {
  Tag::Emphasis | Tag::Strong => buf.close_tag(),
- Tag::Paragraph | Tag::Heading(..) => return ControlFlow::BREAK,
+ Tag::Paragraph | Tag::Heading(..) => return ControlFlow::Break(()),
  _ => {}
  },
  Event::HardBreak | Event::SoftBreak => buf.push(" ")?,
  _ => {}
  };
- ControlFlow::CONTINUE
+ ControlFlow::Continue(())
  });
 
  (buf.finish(), stopped_early)

src/librustdoc/lib.rs

@@ -6,7 +6,6 @@
 #![feature(array_methods)]
 #![feature(assert_matches)]
 #![feature(box_patterns)]
-#![feature(control_flow_enum)]
 #![feature(drain_filter)]
 #![feature(is_terminal)]
 #![feature(let_chains)]

src/tools/clippy/clippy_lints/src/lib.rs

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

src/tools/clippy/clippy_lints/src/methods/collapsible_str_replace.rs

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

src/tools/clippy/clippy_utils/src/lib.rs

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

src/tools/clippy/clippy_utils/src/macros.rs

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

src/tools/clippy/clippy_utils/src/mir/possible_borrower.rs

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