Skip to content

Commit

Permalink
Rollup merge of #85579 - alex:patch-1, r=yaahc
Browse files Browse the repository at this point in the history
Added Arc::try_pin

This helper is in line with other other allocation helpers on Arc.

I didn't think this would require an RFC or broader discussion, let me know if that's incorrect.
  • Loading branch information
JohnTitor authored Jul 15, 2021
2 parents b919797 + a214911 commit 10f335f
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion library/alloc/src/sync.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ use core::marker::{PhantomData, Unpin, Unsize};
use core::mem::size_of_val;
use core::mem::{self, align_of_val_raw};
use core::ops::{CoerceUnsized, Deref, DispatchFromDyn, Receiver};
#[cfg(not(no_global_oom_handling))]
use core::pin::Pin;
use core::ptr::{self, NonNull};
#[cfg(not(no_global_oom_handling))]
Expand Down Expand Up @@ -494,6 +493,13 @@ impl<T> Arc<T> {
unsafe { Pin::new_unchecked(Arc::new(data)) }
}

/// Constructs a new `Pin<Arc<T>>`, return an error if allocation fails.
#[unstable(feature = "allocator_api", issue = "32838")]
#[inline]
pub fn try_pin(data: T) -> Result<Pin<Arc<T>>, AllocError> {
unsafe { Ok(Pin::new_unchecked(Arc::try_new(data)?)) }
}

/// Constructs a new `Arc<T>`, returning an error if allocation fails.
///
/// # Examples
Expand Down

0 comments on commit 10f335f

Please sign in to comment.