Skip to content

Commit af2be23

Browse files
committed
Auto merge of #53385 - matklad:stabilize-find-map, r=KodrAus
Stablize Iterator::find_map Stabilization PR for #49602
2 parents e41f411 + 057878a commit af2be23

File tree

6 files changed

+1
-9
lines changed

6 files changed

+1
-9
lines changed

src/libcore/iter/iterator.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -1794,17 +1794,14 @@ pub trait Iterator {
17941794
/// # Examples
17951795
///
17961796
/// ```
1797-
/// #![feature(iterator_find_map)]
17981797
/// let a = ["lol", "NaN", "2", "5"];
17991798
///
18001799
/// let mut first_number = a.iter().find_map(|s| s.parse().ok());
18011800
///
18021801
/// assert_eq!(first_number, Some(2));
18031802
/// ```
18041803
#[inline]
1805-
#[unstable(feature = "iterator_find_map",
1806-
reason = "unstable new API",
1807-
issue = "49602")]
1804+
#[stable(feature = "iterator_find_map", since = "1.30.0")]
18081805
fn find_map<B, F>(&mut self, mut f: F) -> Option<B> where
18091806
Self: Sized,
18101807
F: FnMut(Self::Item) -> Option<B>,

src/libcore/tests/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
#![feature(slice_align_to)]
3838
#![feature(align_offset)]
3939
#![feature(reverse_bits)]
40-
#![feature(iterator_find_map)]
4140
#![feature(inner_deref)]
4241
#![feature(slice_internals)]
4342
#![feature(option_replace)]

src/librustc/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
#![feature(const_fn)]
4646
#![feature(core_intrinsics)]
4747
#![feature(drain_filter)]
48-
#![feature(iterator_find_map)]
4948
#![cfg_attr(windows, feature(libc))]
5049
#![cfg_attr(stage0, feature(macro_vis_matcher))]
5150
#![feature(never_type)]

src/librustc_traits/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#![feature(crate_in_paths)]
1515
#![feature(crate_visibility_modifier)]
1616
#![feature(extern_prelude)]
17-
#![feature(iterator_find_map)]
1817
#![feature(in_band_lifetimes)]
1918
#![cfg_attr(not(stage0), feature(nll))]
2019

src/librustc_typeck/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ This API is completely unstable and subject to change.
7575
#![feature(box_syntax)]
7676
#![feature(crate_visibility_modifier)]
7777
#![feature(exhaustive_patterns)]
78-
#![feature(iterator_find_map)]
7978
#![cfg_attr(not(stage0), feature(nll))]
8079
#![feature(quote)]
8180
#![feature(refcell_replace_swap)]

src/librustdoc/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#![feature(rustc_private)]
1717
#![feature(box_patterns)]
1818
#![feature(box_syntax)]
19-
#![feature(iterator_find_map)]
2019
#![cfg_attr(not(stage0), feature(nll))]
2120
#![feature(set_stdio)]
2221
#![feature(slice_sort_by_cached_key)]

0 commit comments

Comments
 (0)