diff --git a/src/liballoc/arc.rs b/src/liballoc/arc.rs index 9479d47943eab..9b6b74f3b7b91 100644 --- a/src/liballoc/arc.rs +++ b/src/liballoc/arc.rs @@ -79,6 +79,7 @@ use core::cmp::Ordering; use core::mem::{align_of_val, size_of_val}; use core::intrinsics::abort; use core::mem; +use core::mem::uninitialized; use core::ops::Deref; #[cfg(not(stage0))] use core::ops::CoerceUnsized; @@ -910,6 +911,35 @@ impl From for Arc { } } +impl Weak { + /// Constructs a new `Weak` without an accompanying instance of T. + /// + /// This allocates memory for T, but does not initialize it. Calling + /// Weak::upgrade() on the return value always gives None. + /// + /// # Examples + /// + /// ``` + /// #![feature(downgraded_weak)] + /// + /// use std::sync::Weak; + /// + /// let empty: Weak = Weak::new(); + /// ``` + #[unstable(feature = "downgraded_weak", + reason = "recently added", + issue = "30425")] + pub fn new() -> Weak { + unsafe { + Weak { _ptr: Shared::new(Box::into_raw(box ArcInner { + strong: atomic::AtomicUsize::new(0), + weak: atomic::AtomicUsize::new(1), + data: uninitialized(), + }))} + } + } +} + #[cfg(test)] mod tests { use std::clone::Clone; @@ -1160,6 +1190,12 @@ mod tests { let foo_arc = Arc::from(foo); assert!(123 == *foo_arc); } + + #[test] + fn test_new_weak() { + let foo: Weak = Weak::new(); + assert!(foo.upgrade().is_none()); + } } #[stable(feature = "rust1", since = "1.0.0")] diff --git a/src/liballoc/rc.rs b/src/liballoc/rc.rs index 8f00605d33b37..bf4ed8065e696 100644 --- a/src/liballoc/rc.rs +++ b/src/liballoc/rc.rs @@ -164,7 +164,7 @@ use core::intrinsics::{assume, abort}; use core::marker; #[cfg(not(stage0))] use core::marker::Unsize; -use core::mem::{self, align_of_val, size_of_val, forget}; +use core::mem::{self, align_of_val, size_of_val, forget, uninitialized}; use core::ops::Deref; #[cfg(not(stage0))] use core::ops::CoerceUnsized; @@ -830,6 +830,37 @@ impl fmt::Debug for Weak { } } +impl Weak { + /// Constructs a new `Weak` without an accompanying instance of T. + /// + /// This allocates memory for T, but does not initialize it. Calling + /// Weak::upgrade() on the return value always gives None. + /// + /// # Examples + /// + /// ``` + /// #![feature(downgraded_weak)] + /// + /// use std::rc::Weak; + /// + /// let empty: Weak = Weak::new(); + /// ``` + #[unstable(feature = "downgraded_weak", + reason = "recently added", + issue="30425")] + pub fn new() -> Weak { + unsafe { + Weak { + _ptr: Shared::new(Box::into_raw(box RcBox { + strong: Cell::new(0), + weak: Cell::new(1), + value: uninitialized(), + })), + } + } + } +} + // NOTE: We checked_add here to deal with mem::forget safety. In particular // if you mem::forget Rcs (or Weaks), the ref-count can overflow, and then // you can free the allocation while outstanding Rcs (or Weaks) exist. @@ -1122,6 +1153,12 @@ mod tests { let foo_rc = Rc::from(foo); assert!(123 == *foo_rc); } + + #[test] + fn test_new_weak() { + let foo: Weak = Weak::new(); + assert!(foo.upgrade().is_none()); + } } #[stable(feature = "rust1", since = "1.0.0")]