📝 adjust some functions

Author: Xudong-Huang

src/link.rs

@@ -1,4 +1,3 @@
-use alloc::sync::{Arc, Weak};
 use core::fmt;
 use core::marker::PhantomData;
 use core::sync::atomic::{AtomicUsize, Ordering};
@@ -12,10 +11,6 @@ const REFCOUNT_MASK: usize = (1 << (LEADING_BITS + ALIGN_BITS)) - 1;
 const UPDTATE_MASK: usize = 1 << (LEADING_BITS + ALIGN_BITS - 1);
 const UPDATE_REF_MASK: usize = REFCOUNT_MASK & !UPDTATE_MASK;
 
-//---------------------------------------------------------------------------------------
-// LinkWrapper
-//---------------------------------------------------------------------------------------
-
 #[repr(C)]
 union Ptr<T> {
     addr: usize,
@@ -153,17 +148,3 @@ impl<T: fmt::Debug> fmt::Debug for LinkWrapper<T> {
         f.debug_struct("Link").field("ptr", &ptr).finish()
     }
 }
-
-#[inline]
-pub(crate) fn ptr_to_arc<T>(ptr: *const T) -> Option<Arc<T>> {
-    (!ptr.is_null()).then(|| unsafe { Arc::from_raw(ptr) })
-}
-
-#[inline]
-pub(crate) fn ptr_to_weak<T>(ptr: *const T) -> Weak<T> {
-    if ptr.is_null() {
-        Weak::new()
-    } else {
-        unsafe { Weak::from_raw(ptr) }
-    }
-}

src/rcu_cell.rs

@@ -3,11 +3,12 @@ use core::mem::ManuallyDrop;
 use core::ptr;
 use core::sync::atomic::Ordering;
 
-use crate::link::{ptr_to_arc, LinkWrapper};
+use crate::link::LinkWrapper;
 
-//---------------------------------------------------------------------------------------
-// RcuCell
-//---------------------------------------------------------------------------------------
+#[inline]
+fn ptr_to_arc<T>(ptr: *const T) -> Option<Arc<T>> {
+    (!ptr.is_null()).then(|| unsafe { Arc::from_raw(ptr) })
+}
 
 /// RCU cell, it behaves like `RwLock<Option<Arc<T>>>`
 #[derive(Debug)]

src/rcu_weak.rs

@@ -3,10 +3,16 @@ use core::mem::ManuallyDrop;
 use core::ptr;
 use core::sync::atomic::Ordering;
 
-use crate::link::{ptr_to_weak, LinkWrapper};
-//---------------------------------------------------------------------------------------
-// RcuWeak
-//---------------------------------------------------------------------------------------
+use crate::link::LinkWrapper;
+
+#[inline]
+fn ptr_to_weak<T>(ptr: *const T) -> Weak<T> {
+    if ptr.is_null() {
+        Weak::new()
+    } else {
+        unsafe { Weak::from_raw(ptr) }
+    }
+}
 
 /// RCU weak cell, it behaves like `RwLock<Weak<T>>`
 #[derive(Debug)]
@@ -48,6 +54,15 @@ impl<T> RcuWeak<T> {
         }
     }
 
+    /// convert the rcu weak to a `Weak`` value
+    #[inline]
+    pub fn into_weak(self) -> Weak<T> {
+        let ptr = self.link.get_ref();
+        let ret = ptr_to_weak(ptr);
+        let _ = ManuallyDrop::new(self);
+        ret
+    }
+
     /// write a new weak value to the rcu weak cell and return the old value
     #[inline]
     pub fn write(&self, data: Weak<T>) -> Weak<T> {