mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #92483 - ksqsf:master, r=dtolnay

Browse Source 
Stabilize `result_cloned` and `result_copied`

Tracking issue: #63168

The FCP is now completed.
This commit is contained in:
Matthias Krüger 2022-01-05 15:05:47 +01:00 committed by GitHub
commit 051d591edf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
library/core/src/result.rs
View File

@ -1504,14 +1504,14 @@ impl<T, E> Result<&T, E> {
/// # Examples /// # Examples
/// ///
/// ``` /// ```
/// #![feature(result_copied)]
/// let val = 12; /// let val = 12;
/// let x: Result<&i32, i32> = Ok(&val); /// let x: Result<&i32, i32> = Ok(&val);
/// assert_eq!(x, Ok(&12)); /// assert_eq!(x, Ok(&12));
/// let copied = x.copied(); /// let copied = x.copied();
/// assert_eq!(copied, Ok(12)); /// assert_eq!(copied, Ok(12));
/// ``` /// ```
#[unstable(feature = "result_copied", reason = "newly added", issue = "63168")] #[inline]
#[stable(feature = "result_copied", since = "1.59.0")]
pub fn copied(self) -> Result<T, E> pub fn copied(self) -> Result<T, E>
where where
T: Copy, T: Copy,
@ -1525,14 +1525,14 @@ pub fn copied(self) -> Result<T, E>
/// # Examples /// # Examples
/// ///
/// ``` /// ```
/// #![feature(result_cloned)]
/// let val = 12; /// let val = 12;
/// let x: Result<&i32, i32> = Ok(&val); /// let x: Result<&i32, i32> = Ok(&val);
/// assert_eq!(x, Ok(&12)); /// assert_eq!(x, Ok(&12));
/// let cloned = x.cloned(); /// let cloned = x.cloned();
/// assert_eq!(cloned, Ok(12)); /// assert_eq!(cloned, Ok(12));
/// ``` /// ```
#[unstable(feature = "result_cloned", reason = "newly added", issue = "63168")] #[inline]
#[stable(feature = "result_cloned", since = "1.59.0")]
pub fn cloned(self) -> Result<T, E> pub fn cloned(self) -> Result<T, E>
where where
T: Clone, T: Clone,
@ -1548,14 +1548,14 @@ impl<T, E> Result<&mut T, E> {
/// # Examples /// # Examples
/// ///
/// ``` /// ```
/// #![feature(result_copied)]
/// let mut val = 12; /// let mut val = 12;
/// let x: Result<&mut i32, i32> = Ok(&mut val); /// let x: Result<&mut i32, i32> = Ok(&mut val);
/// assert_eq!(x, Ok(&mut 12)); /// assert_eq!(x, Ok(&mut 12));
/// let copied = x.copied(); /// let copied = x.copied();
/// assert_eq!(copied, Ok(12)); /// assert_eq!(copied, Ok(12));
/// ``` /// ```
#[unstable(feature = "result_copied", reason = "newly added", issue = "63168")] #[inline]
#[stable(feature = "result_copied", since = "1.59.0")]
pub fn copied(self) -> Result<T, E> pub fn copied(self) -> Result<T, E>
where where
T: Copy, T: Copy,
@ -1569,14 +1569,14 @@ pub fn copied(self) -> Result<T, E>
/// # Examples /// # Examples
/// ///
/// ``` /// ```
/// #![feature(result_cloned)]
/// let mut val = 12; /// let mut val = 12;
/// let x: Result<&mut i32, i32> = Ok(&mut val); /// let x: Result<&mut i32, i32> = Ok(&mut val);
/// assert_eq!(x, Ok(&mut 12)); /// assert_eq!(x, Ok(&mut 12));
/// let cloned = x.cloned(); /// let cloned = x.cloned();
/// assert_eq!(cloned, Ok(12)); /// assert_eq!(cloned, Ok(12));
/// ``` /// ```
#[unstable(feature = "result_cloned", reason = "newly added", issue = "63168")] #[inline]
#[stable(feature = "result_cloned", since = "1.59.0")]
pub fn cloned(self) -> Result<T, E> pub fn cloned(self) -> Result<T, E>
where where
T: Clone, T: Clone,