bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Stablize arc_unwrap_or_clone

Browse source
This commit is contained in:
Muhammad Hamza 2023-10-19 22:33:09 +05:00
parent c104861b7b
commit 540921e468
No known key found for this signature in database
GPG key ID: B7812BE5DBACA4E0
2 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
library/alloc/src/rc.rs
View file

@ -1748,7 +1748,6 @@ impl<T: Clone, A: Allocator + Clone> Rc<T, A> {
/// # Examples /// # Examples
/// ///
/// ``` /// ```
/// #![feature(arc_unwrap_or_clone)]
/// # use std::{ptr, rc::Rc}; /// # use std::{ptr, rc::Rc};
/// let inner = String::from("test"); /// let inner = String::from("test");
/// let ptr = inner.as_ptr(); /// let ptr = inner.as_ptr();
@ -1769,7 +1768,7 @@ impl<T: Clone, A: Allocator + Clone> Rc<T, A> {
/// assert!(ptr::eq(ptr, inner.as_ptr())); /// assert!(ptr::eq(ptr, inner.as_ptr()));
/// ``` /// ```
#[inline] #[inline]
#[unstable(feature = "arc_unwrap_or_clone", issue = "93610")] #[stable(feature = "arc_unwrap_or_clone", since = "CURRENT_RUSTC_VERSION")]
pub fn unwrap_or_clone(this: Self) -> T { pub fn unwrap_or_clone(this: Self) -> T {
Rc::try_unwrap(this).unwrap_or_else(|rc| (*rc).clone()) Rc::try_unwrap(this).unwrap_or_else(|rc| (*rc).clone())
} }

3
library/alloc/src/sync.rs
View file

@ -2174,7 +2174,6 @@ impl<T: Clone, A: Allocator + Clone> Arc<T, A> {
/// # Examples /// # Examples
/// ///
/// ``` /// ```
/// #![feature(arc_unwrap_or_clone)]
/// # use std::{ptr, sync::Arc}; /// # use std::{ptr, sync::Arc};
/// let inner = String::from("test"); /// let inner = String::from("test");
/// let ptr = inner.as_ptr(); /// let ptr = inner.as_ptr();
@ -2195,7 +2194,7 @@ impl<T: Clone, A: Allocator + Clone> Arc<T, A> {
/// assert!(ptr::eq(ptr, inner.as_ptr())); /// assert!(ptr::eq(ptr, inner.as_ptr()));
/// ``` /// ```
#[inline] #[inline]
#[unstable(feature = "arc_unwrap_or_clone", issue = "93610")] #[stable(feature = "arc_unwrap_or_clone", since = "CURRENT_RUSTC_VERSION")]
pub fn unwrap_or_clone(this: Self) -> T { pub fn unwrap_or_clone(this: Self) -> T {
Arc::try_unwrap(this).unwrap_or_else(|arc| (*arc).clone()) Arc::try_unwrap(this).unwrap_or_else(|arc| (*arc).clone())
} }