diff --git a/components/servo_arc/lib.rs b/components/servo_arc/lib.rs index 7d89238603f..780f7485eb9 100644 --- a/components/servo_arc/lib.rs +++ b/components/servo_arc/lib.rs @@ -86,10 +86,14 @@ const STATIC_REFCOUNT: usize = usize::MAX; /// See the documentation for [`Arc`] in the standard library. Unlike the /// standard library `Arc`, this `Arc` does not support weak reference counting. /// +/// See the discussion in https://github.com/rust-lang/rust/pull/60594 for the +/// usage of PhantomData. +/// /// [`Arc`]: https://doc.rust-lang.org/stable/std/sync/struct.Arc.html #[repr(C)] pub struct Arc { p: ptr::NonNull>, + phantom: PhantomData, } /// An `Arc` that is known to be uniquely owned @@ -169,6 +173,7 @@ impl Arc { unsafe { Arc { p: ptr::NonNull::new_unchecked(Box::into_raw(x)), + phantom: PhantomData, } } } @@ -198,6 +203,7 @@ impl Arc { let ptr = (ptr as *const u8).offset(-offset_of!(ArcInner, data)); Arc { p: ptr::NonNull::new_unchecked(ptr as *mut ArcInner), + phantom: PhantomData, } } @@ -224,6 +230,7 @@ impl Arc { Arc { p: ptr::NonNull::new_unchecked(ptr), + phantom: PhantomData, } } @@ -334,6 +341,7 @@ impl Clone for Arc { unsafe { Arc { p: ptr::NonNull::new_unchecked(self.ptr()), + phantom: PhantomData, } } } @@ -687,6 +695,7 @@ impl Arc> { unsafe { Arc { p: ptr::NonNull::new_unchecked(ptr), + phantom: PhantomData, } } } @@ -768,6 +777,7 @@ type HeaderSliceWithLength = HeaderSlice, T>; #[repr(C)] pub struct ThinArc { ptr: ptr::NonNull>>, + phantom: PhantomData<(H, T)>, } unsafe impl Send for ThinArc {} @@ -797,6 +807,7 @@ impl ThinArc { let transient = unsafe { NoDrop::new(Arc { p: ptr::NonNull::new_unchecked(thin_to_thick(self.ptr.as_ptr())), + phantom: PhantomData, }) }; @@ -875,7 +886,7 @@ impl Clone for ThinArc { impl Drop for ThinArc { #[inline] fn drop(&mut self) { - let _ = Arc::from_thin(ThinArc { ptr: self.ptr }); + let _ = Arc::from_thin(ThinArc { ptr: self.ptr, phantom: PhantomData, }); } } @@ -896,6 +907,7 @@ impl Arc> { ptr: unsafe { ptr::NonNull::new_unchecked(thin_ptr as *mut ArcInner>) }, + phantom: PhantomData, } } @@ -908,6 +920,7 @@ impl Arc> { unsafe { Arc { p: ptr::NonNull::new_unchecked(ptr), + phantom: PhantomData, } } }