From 057878ac71c2e9647e90636e2517f64bc4ac4288 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Wed, 15 Aug 2018 14:12:17 +0300 Subject: [PATCH] Stablize Iterator::find_map --- src/libcore/iter/iterator.rs | 5 +---- src/libcore/tests/lib.rs | 1 - src/librustc/lib.rs | 1 - src/librustc_traits/lib.rs | 1 - src/librustc_typeck/lib.rs | 1 - src/librustdoc/lib.rs | 1 - 6 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/libcore/iter/iterator.rs b/src/libcore/iter/iterator.rs index 5681cfb04f208..579a808942545 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(&mut self, mut f: F) -> Option where Self: Sized, F: FnMut(Self::Item) -> Option, diff --git a/src/libcore/tests/lib.rs b/src/libcore/tests/lib.rs index fc92a5a222512..e48f3b36c6586 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 b6f4bd6dc408c..adb57fc4b6385 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))] #![feature(macro_vis_matcher)] #![feature(never_type)] diff --git a/src/librustc_traits/lib.rs b/src/librustc_traits/lib.rs index ba6b2c57bfac6..93b22427e6a0a 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 62f93ea20e48c..679fd3ee0d7ca 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 7581965cc0cad..dfe3e94d65444 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)]