Stabilize the map/value methods on ControlFlow

And fix the stability attribute on the `pub use` in `core::ops`.

Author: scottmcm

compiler/rustc_borrowck/src/lib.rs

@@ -5,7 +5,6 @@
 #![doc(rust_logo)]
 #![feature(assert_matches)]
 #![feature(box_patterns)]
-#![feature(control_flow_enum)]
 #![feature(file_buffered)]
 #![feature(let_chains)]
 #![feature(never_type)]

compiler/rustc_hir_analysis/src/lib.rs

@@ -63,7 +63,6 @@ This API is completely unstable and subject to change.
 #![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
 #![doc(rust_logo)]
 #![feature(assert_matches)]
-#![feature(control_flow_enum)]
 #![feature(if_let_guard)]
 #![feature(iter_intersperse)]
 #![feature(let_chains)]

compiler/rustc_hir_typeck/src/lib.rs

@@ -3,7 +3,6 @@
 #![allow(rustc::untranslatable_diagnostic)]
 #![feature(array_windows)]
 #![feature(box_patterns)]
-#![feature(control_flow_enum)]
 #![feature(if_let_guard)]
 #![feature(let_chains)]
 #![feature(never_type)]

compiler/rustc_infer/src/lib.rs

@@ -20,7 +20,6 @@
 #![doc(rust_logo)]
 #![feature(assert_matches)]
 #![feature(box_patterns)]
-#![feature(control_flow_enum)]
 #![feature(extend_one)]
 #![feature(if_let_guard)]
 #![feature(iter_intersperse)]

compiler/rustc_lint/src/lib.rs

@@ -32,7 +32,6 @@
 #![feature(array_windows)]
 #![feature(assert_matches)]
 #![feature(box_patterns)]
-#![feature(control_flow_enum)]
 #![feature(extract_if)]
 #![feature(if_let_guard)]
 #![feature(iter_order_by)]

compiler/rustc_metadata/src/lib.rs

@@ -3,7 +3,6 @@
 #![allow(rustc::potential_query_instability)]
 #![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
 #![doc(rust_logo)]
-#![feature(control_flow_enum)]
 #![feature(coroutines)]
 #![feature(decl_macro)]
 #![feature(error_iter)]

compiler/rustc_trait_selection/src/lib.rs

@@ -20,7 +20,6 @@
 #![feature(associated_type_defaults)]
 #![feature(box_patterns)]
 #![feature(cfg_version)]
-#![feature(control_flow_enum)]
 #![feature(extract_if)]
 #![feature(if_let_guard)]
 #![feature(iter_intersperse)]

library/core/src/ops/control_flow.rs

@@ -171,14 +171,13 @@ impl<B, C> ControlFlow<B, C> {
 /// # Examples
 ///
 /// ```
-/// #![feature(control_flow_enum)]
 /// use std::ops::ControlFlow;
 ///
 /// assert_eq!(ControlFlow::<i32, String>::Break(3).break_value(), Some(3));
 /// assert_eq!(ControlFlow::<String, i32>::Continue(3).break_value(), None);
 /// ```
 #[inline]
-#[unstable(feature = "control_flow_enum",reason = "new API", issue = "75744")]
+#[stable(feature = "control_flow_enum",since = "CURRENT_RUSTC_VERSION")]
 pubfnbreak_value(self) -> Option<B>{
 matchself{
 ControlFlow::Continue(..) => None,
@@ -189,11 +188,8 @@ impl<B, C> ControlFlow<B, C> {
 /// Maps `ControlFlow<B, C>` to `ControlFlow<T, C>` by applying a function
 /// to the break value in case it exists.
 #[inline]
-#[unstable(feature = "control_flow_enum", reason = "new API", issue = "75744")]
-pubfnmap_break<T,F>(self,f:F) -> ControlFlow<T,C>
-where
-F:FnOnce(B) -> T,
-{
+#[stable(feature = "control_flow_enum", since = "CURRENT_RUSTC_VERSION")]
+pubfnmap_break<T>(self,f:implFnOnce(B) -> T) -> ControlFlow<T,C>{
 matchself{
 ControlFlow::Continue(x) => ControlFlow::Continue(x),
 ControlFlow::Break(x) => ControlFlow::Break(f(x)),
@@ -206,14 +202,13 @@ impl<B, C> ControlFlow<B, C> {
 /// # Examples
 ///
 /// ```
-/// #![feature(control_flow_enum)]
 /// use std::ops::ControlFlow;
 ///
 /// assert_eq!(ControlFlow::<i32, String>::Break(3).continue_value(), None);
 /// assert_eq!(ControlFlow::<String, i32>::Continue(3).continue_value(), Some(3));
 /// ```
 #[inline]
-#[unstable(feature = "control_flow_enum",reason = "new API", issue = "75744")]
+#[stable(feature = "control_flow_enum",since = "CURRENT_RUSTC_VERSION")]
 pubfncontinue_value(self) -> Option<C>{
 matchself{
 ControlFlow::Continue(x) => Some(x),
@@ -224,11 +219,8 @@ impl<B, C> ControlFlow<B, C> {
 /// Maps `ControlFlow<B, C>` to `ControlFlow<B, T>` by applying a function
 /// to the continue value in case it exists.
 #[inline]
-#[unstable(feature = "control_flow_enum", reason = "new API", issue = "75744")]
-pubfnmap_continue<T,F>(self,f:F) -> ControlFlow<B,T>
-where
-F:FnOnce(C) -> T,
-{
+#[stable(feature = "control_flow_enum", since = "CURRENT_RUSTC_VERSION")]
+pubfnmap_continue<T>(self,f:implFnOnce(C) -> T) -> ControlFlow<B,T>{
 matchself{
 ControlFlow::Continue(x) => ControlFlow::Continue(f(x)),
 ControlFlow::Break(x) => ControlFlow::Break(x),

library/core/src/ops/mod.rs

@@ -162,7 +162,7 @@ pub use self::async_function::{AsyncFn, AsyncFnMut, AsyncFnOnce};
 pubuseself::bit::{BitAnd,BitOr,BitXor,Not,Shl,Shr};
 #[stable(feature = "op_assign_traits", since = "1.8.0")]
 pubuseself::bit::{BitAndAssign,BitOrAssign,BitXorAssign,ShlAssign,ShrAssign};
-#[unstable(feature = "control_flow_enum",reason = "new API", issue = "75744")]
+#[stable(feature = "control_flow_enum_type",since = "1.55.0")]
 pubuseself::control_flow::ControlFlow;
 #[unstable(feature = "coroutine_trait", issue = "43122")]
 pubuseself::coroutine::{Coroutine,CoroutineState};