bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #49575 - tmccombs:option-filter-stabilize, r=withoutboats

Browse source 
Stabilize `Option::filter`.

Fixes #45860
This commit is contained in:
kennytm 2018-04-11 19:56:42 +08:00 • committed by GitHub
commit 5ee5de10d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libcore/option.rs
View file

@ -628,8 +628,6 @@ impl<T> Option<T> {
/// # Examples /// # Examples
/// ///
/// ```rust /// ```rust
/// #![feature(option_filter)]
///
/// fn is_even(n: &i32) -> bool { /// fn is_even(n: &i32) -> bool {
/// n % 2 == 0 /// n % 2 == 0
/// } /// }
@ -639,7 +637,7 @@ impl<T> Option<T> {
/// assert_eq!(Some(4).filter(is_even), Some(4)); /// assert_eq!(Some(4).filter(is_even), Some(4));
/// ``` /// ```
#[inline] #[inline]
#[unstable(feature = "option_filter", issue = "45860")] #[stable(feature = "option_filter", since = "1.27.0")]
pub fn filter<P: FnOnce(&T) -> bool>(self, predicate: P) -> Self { pub fn filter<P: FnOnce(&T) -> bool>(self, predicate: P) -> Self {
if let Some(x) = self { if let Some(x) = self {
if predicate(&x) { if predicate(&x) {

1
src/librustc_typeck/lib.rs
View file

@ -76,7 +76,6 @@ This API is completely unstable and subject to change.
#![feature(crate_visibility_modifier)] #![feature(crate_visibility_modifier)]
#![feature(from_ref)] #![feature(from_ref)]
#![feature(exhaustive_patterns)] #![feature(exhaustive_patterns)]
#![feature(option_filter)]
#![feature(quote)] #![feature(quote)]
#![feature(refcell_replace_swap)] #![feature(refcell_replace_swap)]
#![feature(rustc_diagnostic_macros)] #![feature(rustc_diagnostic_macros)]