bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Stabilize result_option_inspect

Browse source
This commit is contained in:
Slanterns 2023-10-18 07:35:23 +08:00
parent 09df6108c8
commit 10e6372a83
No known key found for this signature in database
GPG key ID: 1AA37EE7FAAE433A
2 changed files with 4 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
library/core/src/option.rs
View file

@ -1072,8 +1072,6 @@ impl<T> Option<T> {
/// # Examples /// # Examples
/// ///
/// ``` /// ```
/// #![feature(result_option_inspect)]
///
/// let v = vec![1, 2, 3, 4, 5]; /// let v = vec![1, 2, 3, 4, 5];
/// ///
/// // prints "got: 4" /// // prints "got: 4"
@ -1083,11 +1081,8 @@ impl<T> Option<T> {
/// let x: Option<&usize> = v.get(5).inspect(|x| println!("got: {x}")); /// let x: Option<&usize> = v.get(5).inspect(|x| println!("got: {x}"));
/// ``` /// ```
#[inline] #[inline]
#[unstable(feature = "result_option_inspect", issue = "91345")] #[stable(feature = "result_option_inspect", since = "CURRENT_RUSTC_VERSION")]
pub fn inspect<F>(self, f: F) -> Self pub fn inspect<F: FnOnce(&T)>(self, f: F) -> Self {
where
F: FnOnce(&T),
{
if let Some(ref x) = self { if let Some(ref x) = self {
f(x); f(x);
} }

8
library/core/src/result.rs
View file

@ -835,8 +835,6 @@ impl<T, E> Result<T, E> {
/// # Examples /// # Examples
/// ///
/// ``` /// ```
/// #![feature(result_option_inspect)]
///
/// let x: u8 = "4" /// let x: u8 = "4"
/// .parse::<u8>() /// .parse::<u8>()
/// .inspect(|x| println!("original: {x}")) /// .inspect(|x| println!("original: {x}"))
@ -844,7 +842,7 @@ impl<T, E> Result<T, E> {
/// .expect("failed to parse number"); /// .expect("failed to parse number");
/// ``` /// ```
#[inline] #[inline]
#[unstable(feature = "result_option_inspect", issue = "91345")] #[stable(feature = "result_option_inspect", since = "CURRENT_RUSTC_VERSION")]
pub fn inspect<F: FnOnce(&T)>(self, f: F) -> Self { pub fn inspect<F: FnOnce(&T)>(self, f: F) -> Self {
if let Ok(ref t) = self { if let Ok(ref t) = self {
f(t); f(t);
@ -858,8 +856,6 @@ impl<T, E> Result<T, E> {
/// # Examples /// # Examples
/// ///
/// ``` /// ```
/// #![feature(result_option_inspect)]
///
/// use std::{fs, io}; /// use std::{fs, io};
/// ///
/// fn read() -> io::Result<String> { /// fn read() -> io::Result<String> {
@ -868,7 +864,7 @@ impl<T, E> Result<T, E> {
/// } /// }
/// ``` /// ```
#[inline] #[inline]
#[unstable(feature = "result_option_inspect", issue = "91345")] #[stable(feature = "result_option_inspect", since = "CURRENT_RUSTC_VERSION")]
pub fn inspect_err<F: FnOnce(&E)>(self, f: F) -> Self { pub fn inspect_err<F: FnOnce(&E)>(self, f: F) -> Self {
if let Err(ref e) = self { if let Err(ref e) = self {
f(e); f(e);