Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement Weak::new_downgraded() (#30425) #30467

Merged
merged 7 commits into from Dec 30, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 changes: 36 additions & 0 deletions src/liballoc/arc.rs
Expand Up @@ -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;
Expand Down Expand Up @@ -910,6 +911,35 @@ impl<T> From<T> for Arc<T> {
}
}

impl<T> Weak<T> {
/// Constructs a new `Weak<T>` without an accompanying instance of T.
///
/// This allocates memory for T, but does not initialize it. Calling
/// Weak<T>::upgrade() on the return value always gives None.
///
/// # Examples
///
/// ```
/// #![feature(downgraded_weak)]
///
/// use std::sync::Weak;
///
/// let empty: Weak<i64> = Weak::new();
/// ```
#[unstable(feature = "downgraded_weak",
reason = "recently added",
issue = "30425")]
pub fn new() -> Weak<T> {
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;
Expand Down Expand Up @@ -1160,6 +1190,12 @@ mod tests {
let foo_arc = Arc::from(foo);
assert!(123 == *foo_arc);
}

#[test]
fn test_new_weak() {
let foo: Weak<usize> = Weak::new();
assert!(foo.upgrade().is_none());
}
}

#[stable(feature = "rust1", since = "1.0.0")]
Expand Down
39 changes: 38 additions & 1 deletion src/liballoc/rc.rs
Expand Up @@ -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;
Expand Down Expand Up @@ -830,6 +830,37 @@ impl<T: ?Sized + fmt::Debug> fmt::Debug for Weak<T> {
}
}

impl<T> Weak<T> {
/// Constructs a new `Weak<T>` without an accompanying instance of T.
///
/// This allocates memory for T, but does not initialize it. Calling
/// Weak<T>::upgrade() on the return value always gives None.
///
/// # Examples
///
/// ```
/// #![feature(downgraded_weak)]
///
/// use std::rc::Weak;
///
/// let empty: Weak<i64> = Weak::new();
/// ```
#[unstable(feature = "downgraded_weak",
reason = "recently added",
issue="30425")]
pub fn new() -> Weak<T> {
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.
Expand Down Expand Up @@ -1122,6 +1153,12 @@ mod tests {
let foo_rc = Rc::from(foo);
assert!(123 == *foo_rc);
}

#[test]
fn test_new_weak() {
let foo: Weak<usize> = Weak::new();
assert!(foo.upgrade().is_none());
}
}

#[stable(feature = "rust1", since = "1.0.0")]
Expand Down