Add RawUniqueRc methods for sized values

Author: EFanZh

library/alloc/src/raw_rc/raw_rc.rs

@@ -31,6 +31,8 @@ use crate::boxed::Box;
 use crate::raw_rc::MakeMutStrategy;
 use crate::raw_rc::RefCounter;
 #[cfg(not(no_global_oom_handling))]
+use crate::raw_rc::raw_unique_rc::RawUniqueRc;
+#[cfg(not(no_global_oom_handling))]
 use crate::raw_rc::raw_weak;
 use crate::raw_rc::raw_weak::RawWeak;
 #[cfg(not(no_global_oom_handling))]
@@ -415,6 +417,45 @@ impl<T, A> RawRc<T, A> {
         unsafe { Self::from_raw_parts(ptr.as_ptr().cast(), alloc) }
     }
 
+    #[cfg(not(no_global_oom_handling))]
+    unsafe fn new_cyclic_impl<F, R>(mut weak: RawWeak<T, A>, data_fn: F) -> Self
+    where
+        A: Allocator,
+        F: FnOnce(&RawWeak<T, A>) -> T,
+        R: RefCounter,
+    {
+        let guard = unsafe { raw_weak::new_weak_guard::<T, A, R>(&mut weak) };
+        let data = data_fn(&guard);
+
+        mem::forget(guard);
+
+        unsafe { RawUniqueRc::from_weak_with_value(weak, data).into_rc::<R>() }
+    }
+
+    #[cfg(not(no_global_oom_handling))]
+    pub(crate) unsafe fn new_cyclic<F, R>(data_fn: F) -> Self
+    where
+        A: Allocator + Default,
+        F: FnOnce(&RawWeak<T, A>) -> T,
+        R: RefCounter,
+    {
+        let weak = RawWeak::new_uninit::<0>();
+
+        unsafe { Self::new_cyclic_impl::<F, R>(weak, data_fn) }
+    }
+
+    #[cfg(not(no_global_oom_handling))]
+    pub(crate) unsafe fn new_cyclic_in<F, R>(data_fn: F, alloc: A) -> Self
+    where
+        A: Allocator,
+        F: FnOnce(&RawWeak<T, A>) -> T,
+        R: RefCounter,
+    {
+        let weak = RawWeak::new_uninit_in::<0>(alloc);
+
+        unsafe { Self::new_cyclic_impl::<F, R>(weak, data_fn) }
+    }
+
     /// Maps the value in an `RawRc`, reusing the allocation if possible.
     ///
     /// # Safety

library/alloc/src/raw_rc/raw_unique_rc.rs

@@ -1,8 +1,16 @@
 use core::alloc::Allocator;
+#[cfg(not(no_global_oom_handling))]
+use core::convert;
 use core::marker::PhantomData;
+#[cfg(not(no_global_oom_handling))]
+use core::mem::{self, SizedTypeProperties};
+#[cfg(not(no_global_oom_handling))]
+use core::ops::{Residual, Try};
 
 use crate::raw_rc::RefCounter;
 use crate::raw_rc::raw_rc::RawRc;
+#[cfg(not(no_global_oom_handling))]
+use crate::raw_rc::raw_weak;
 use crate::raw_rc::raw_weak::RawWeak;
 use crate::raw_rc::rc_value_pointer::RcValuePointer;
 
@@ -73,3 +81,92 @@ where
         }
     }
 }
+
+impl<T, A> RawUniqueRc<T, A> {
+    #[cfg(not(no_global_oom_handling))]
+    pub(super) unsafe fn from_weak_with_value(weak: RawWeak<T, A>, value: T) -> Self {
+        unsafe { weak.as_ptr().write(value) };
+
+        Self { weak, _marker: PhantomData, _marker2: PhantomData }
+    }
+
+    #[cfg(not(no_global_oom_handling))]
+    pub(crate) fn new(value: T) -> Self
+    where
+        A: Allocator + Default,
+    {
+        unsafe { Self::from_weak_with_value(RawWeak::new_uninit::<0>(), value) }
+    }
+
+    #[cfg(not(no_global_oom_handling))]
+    pub(crate) fn new_in(value: T, alloc: A) -> Self
+    where
+        A: Allocator,
+    {
+        unsafe { Self::from_weak_with_value(RawWeak::new_uninit_in::<0>(alloc), value) }
+    }
+
+    /// Maps the value in a `RawUniqueRc`, reusing the allocation if possible.
+    ///
+    /// # Safety
+    ///
+    /// All accesses to `self` must use the same `RefCounter` implementation for `R`.
+    #[cfg(not(no_global_oom_handling))]
+    pub(crate) unsafe fn map<R, U>(self, f: impl FnOnce(T) -> U) -> RawUniqueRc<U, A>
+    where
+        A: Allocator,
+        R: RefCounter,
+    {
+        fn wrap_fn<T, U>(f: impl FnOnce(T) -> U) -> impl FnOnce(T) -> Result<U, !> {
+            |x| Ok(f(x))
+        }
+
+        unsafe { self.try_map::<R, _, _>(wrap_fn(f), convert::identity) }.into_ok()
+    }
+
+    /// Attempts to map the value in a `RawUniqueRc`, reusing the allocation if possible.
+    ///
+    /// # Safety
+    ///
+    /// All accesses to `self` must use the same `RefCounter` implementation for `R`.
+    #[cfg(not(no_global_oom_handling))]
+    pub(crate) unsafe fn try_map<R, U, V>(
+        mut self,
+        f: impl FnOnce(T) -> U,
+        map_result: impl FnOnce(RawUniqueRc<U::Output, A>) -> V, // How to remove this argument?
+    ) -> <U::Residual as Residual<V>>::TryType
+    where
+        A: Allocator,
+        R: RefCounter,
+        U: Try,
+        U::Residual: Residual<V>,
+    {
+        // Destruct `self` as a `RawWeak<T, A>` if `f` panics or returns a failure value.
+        let guard = unsafe { raw_weak::new_weak_guard::<T, A, R>(&mut self.weak) };
+
+        let (allocation, mapped_value) = if T::LAYOUT == U::Output::LAYOUT
+            && R::unique_rc_weak_count(unsafe { R::from_raw_counter(guard.weak_count_unchecked()) })
+                == 1
+        {
+            let mapped_value = f(unsafe { guard.as_ptr().read() })?;
+
+            // Avoid deallocation on success, reuse the allocation.
+            mem::forget(guard);
+
+            let allocation = unsafe { self.weak.cast() };
+
+            (allocation, mapped_value)
+        } else {
+            let value = unsafe { guard.as_ptr().read() };
+
+            drop(guard);
+
+            let mapped_value = f(value)?;
+            let allocation = RawWeak::new_uninit_in::<0>(self.weak.into_raw_parts().1);
+
+            (allocation, mapped_value)
+        };
+
+        try { map_result(unsafe { RawUniqueRc::from_weak_with_value(allocation, mapped_value) }) }
+    }
+}