Auto merge of #53385 - matklad:stabilize-find-map, r=KodrAus

Stablize Iterator::find_map

Stabilization PR for https://github.com/rust-lang/rust/issues/49602

6 files changed, 1 insertions, 9 deletions

diff --git a/src/libcore/iter/iterator.rs b/src/libcore/iter/iterator.rs
index 39185291053..d45c123d332 100644
--- a/src/libcore/iter/iterator.rs
+++ b/src/libcore/iter/iterator.rs
@@ -1794,7 +1794,6 @@ pub trait Iterator {
     /// # Examples
     ///
     /// ```
-    /// #![feature(iterator_find_map)]
     /// let a = ["lol", "NaN", "2", "5"];
     ///
     /// let mut first_number = a.iter().find_map(|s| s.parse().ok());
@@ -1802,9 +1801,7 @@ pub trait Iterator {
     /// assert_eq!(first_number, Some(2));
     /// ```
     #[inline]
-    #[unstable(feature = "iterator_find_map",
-               reason = "unstable new API",
-               issue = "49602")]
+    #[stable(feature = "iterator_find_map", since = "1.30.0")]
     fn find_map<B, F>(&mut self, mut f: F) -> Option<B> where
         Self: Sized,
         F: FnMut(Self::Item) -> Option<B>,
diff --git a/src/libcore/tests/lib.rs b/src/libcore/tests/lib.rs
index fc92a5a2225..e48f3b36c65 100644
--- a/src/libcore/tests/lib.rs
+++ b/src/libcore/tests/lib.rs
@@ -37,7 +37,6 @@
 #![feature(slice_align_to)]
 #![feature(align_offset)]
 #![feature(reverse_bits)]
-#![feature(iterator_find_map)]
 #![feature(inner_deref)]
 #![feature(slice_internals)]
 #![feature(option_replace)]
diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs
index d43ebf8d415..db37f1883f1 100644
--- a/src/librustc/lib.rs
+++ b/src/librustc/lib.rs
@@ -45,7 +45,6 @@
 #![feature(const_fn)]
 #![feature(core_intrinsics)]
 #![feature(drain_filter)]
-#![feature(iterator_find_map)]
 #![cfg_attr(windows, feature(libc))]
 #![cfg_attr(stage0, feature(macro_vis_matcher))]
 #![feature(never_type)]
diff --git a/src/librustc_traits/lib.rs b/src/librustc_traits/lib.rs
index 700efbd6ba9..7fe1af81951 100644
--- a/src/librustc_traits/lib.rs
+++ b/src/librustc_traits/lib.rs
@@ -14,7 +14,6 @@
 #![feature(crate_in_paths)]
 #![feature(crate_visibility_modifier)]
 #![feature(extern_prelude)]
-#![feature(iterator_find_map)]
 #![feature(in_band_lifetimes)]
 #![cfg_attr(not(stage0), feature(nll))]
 
diff --git a/src/librustc_typeck/lib.rs b/src/librustc_typeck/lib.rs
index eddbac3f541..2239154cbb7 100644
--- a/src/librustc_typeck/lib.rs
+++ b/src/librustc_typeck/lib.rs
@@ -75,7 +75,6 @@ This API is completely unstable and subject to change.
 #![feature(box_syntax)]
 #![feature(crate_visibility_modifier)]
 #![feature(exhaustive_patterns)]
-#![feature(iterator_find_map)]
 #![cfg_attr(not(stage0), feature(nll))]
 #![feature(quote)]
 #![feature(refcell_replace_swap)]
diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs
index a8ae6a94d5c..db19860d223 100644
--- a/src/librustdoc/lib.rs
+++ b/src/librustdoc/lib.rs
@@ -16,7 +16,6 @@
 #![feature(rustc_private)]
 #![feature(box_patterns)]
 #![feature(box_syntax)]
-#![feature(iterator_find_map)]
 #![cfg_attr(not(stage0), feature(nll))]
 #![feature(set_stdio)]
 #![feature(slice_sort_by_cached_key)]