Merge pull request #106 from HalidOdat/feature/trace-rc

Added `Trace` for `Rc`
Manishearth · Jun 16, 2020 · 9b05709 · 9b05709
2 parents c5408d2 + 33dd4ec
commit 9b05709
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git a/gc/src/trace.rs b/gc/src/trace.rs
@@ -5,6 +5,7 @@ use std::num::{
     NonZeroU16, NonZeroU32, NonZeroU64, NonZeroU8, NonZeroUsize,
 };
 use std::path::{Path, PathBuf};
+use std::rc::Rc;
 use std::sync::atomic::{
     AtomicBool, AtomicI16, AtomicI32, AtomicI64, AtomicI8, AtomicIsize, AtomicU16, AtomicU32,
     AtomicU64, AtomicU8, AtomicUsize,
@@ -141,6 +142,7 @@ simple_empty_finalize_trace![
     char,
     String,
     Box<str>,
+    Rc<str>,
     Path,
     PathBuf,
     NonZeroIsize,
@@ -256,6 +258,13 @@ type_arg_tuple_based_finalized_trace_impls![
     (A, B, C, D, E, F, G, H, I, J, K, L);
 ];
 
+impl<T: Trace + ?Sized> Finalize for Rc<T> {}
+unsafe impl<T: Trace + ?Sized> Trace for Rc<T> {
+    custom_trace!(this, {
+        mark(&**this);
+    });
+}
+
 impl<T: Trace + ?Sized> Finalize for Box<T> {}
 unsafe impl<T: Trace + ?Sized> Trace for Box<T> {
     custom_trace!(this, {

diff --git a/gc/tests/trace_impl.rs b/gc/tests/trace_impl.rs
@@ -2,6 +2,7 @@
 
 use gc_derive::{Finalize, Trace};
 use std::cell::RefCell;
+use std::rc::Rc;
 
 thread_local!(static X: RefCell<u8> = RefCell::new(0));
 
@@ -37,6 +38,21 @@ struct InnerBoxStr {
     inner: Box<str>,
 }
 
+#[derive(Trace, Clone, Finalize)]
+struct InnerRcSlice {
+    inner: Box<[u32]>,
+}
+
+#[derive(Trace, Clone, Finalize)]
+struct InnerRcStr {
+    inner: Rc<str>,
+}
+
+#[derive(Trace, Clone, Finalize)]
+struct InnerRcStruct {
+    inner: Rc<Bar>,
+}
+
 #[derive(Trace, Finalize)]
 struct Baz {
     a: Bar,