Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-05-16 13:05:18 +03:00
Code Issues Packages Projects Releases Wiki 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
parent 77777b4528 c7ac32a1c1
commit 5ee5de10d2
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcore/option.rs
+1 -3
View File
@@ -628,8 +628,6 @@ pub fn and_then<U, F: FnOnce(T) -> Option<U>>(self, f: F) -> Option<U> {
/// # Examples
///
/// ```rust
/// #![feature(option_filter)]
///
/// fn is_even(n: &i32) -> bool {
/// n % 2 == 0
/// }
@@ -639,7 +637,7 @@ pub fn and_then<U, F: FnOnce(T) -> Option<U>>(self, f: F) -> Option<U> {
/// assert_eq!(Some(4).filter(is_even), Some(4));
/// ```
#[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 {
if let Some(x) = self {
if predicate(&x) {
src/librustc_typeck/lib.rs
-1
View File
@@ -76,7 +76,6 @@
#![feature(crate_visibility_modifier)]
#![feature(from_ref)]
#![feature(exhaustive_patterns)]
#![feature(option_filter)]
#![feature(quote)]
#![feature(refcell_replace_swap)]
#![feature(rustc_diagnostic_macros)]