diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-01-05 18:41:20 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-01-05 18:41:20 -0800 |
| commit | 2e883a5f5310a257d6ff8a0d886737d7dc1e7ae4 (patch) | |
| tree | d4d000e33b01feac0d57cd018e8ceddc6a403154 /src/liballoc | |
| parent | bb5e16b4b869f0c585c21db110e51165865e8833 (diff) | |
| parent | c6f4a03d12d97162e2775c14ab006d355b04126d (diff) | |
| download | rust-2e883a5f5310a257d6ff8a0d886737d7dc1e7ae4.tar.gz rust-2e883a5f5310a257d6ff8a0d886737d7dc1e7ae4.zip | |
rollup merge of #20560: aturon/stab-2-iter-ops-slice
Conflicts: src/libcollections/slice.rs src/libcore/iter.rs src/libstd/sync/mpsc/mod.rs src/libstd/sync/rwlock.rs
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/arc.rs | 6 | ||||
| -rw-r--r-- | src/liballoc/boxed.rs | 2 | ||||
| -rw-r--r-- | src/liballoc/rc.rs | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/src/liballoc/arc.rs b/src/liballoc/arc.rs index 080d34dbda5..1d679f18feb 100644 --- a/src/liballoc/arc.rs +++ b/src/liballoc/arc.rs @@ -246,7 +246,7 @@ impl<T> BorrowFrom<Arc<T>> for T { } } -#[experimental = "Deref is experimental."] +#[stable] impl<T> Deref for Arc<T> { type Target = T; @@ -290,7 +290,7 @@ impl<T: Send + Sync + Clone> Arc<T> { } #[unsafe_destructor] -#[experimental = "waiting on stability of Drop"] +#[stable] impl<T: Sync + Send> Drop for Arc<T> { /// Drops the `Arc<T>`. /// @@ -418,7 +418,7 @@ impl<T: Sync + Send> Clone for Weak<T> { } #[unsafe_destructor] -#[experimental = "Weak pointers may not belong in this module."] +#[stable] impl<T: Sync + Send> Drop for Weak<T> { /// Drops the `Weak<T>`. /// diff --git a/src/liballoc/boxed.rs b/src/liballoc/boxed.rs index 2c318181b09..33d1cc7f4c7 100644 --- a/src/liballoc/boxed.rs +++ b/src/liballoc/boxed.rs @@ -155,12 +155,14 @@ impl fmt::Show for Box<Any> { } } +#[stable] impl<Sized? T> Deref for Box<T> { type Target = T; fn deref(&self) -> &T { &**self } } +#[stable] impl<Sized? T> DerefMut for Box<T> { fn deref_mut(&mut self) -> &mut T { &mut **self } } diff --git a/src/liballoc/rc.rs b/src/liballoc/rc.rs index d9239e93a07..1621e1934fa 100644 --- a/src/liballoc/rc.rs +++ b/src/liballoc/rc.rs @@ -354,7 +354,7 @@ impl<T> BorrowFrom<Rc<T>> for T { } } -#[experimental = "Deref is experimental."] +#[stable] impl<T> Deref for Rc<T> { type Target = T; @@ -365,7 +365,7 @@ impl<T> Deref for Rc<T> { } #[unsafe_destructor] -#[experimental = "Drop is experimental."] +#[stable] impl<T> Drop for Rc<T> { /// Drops the `Rc<T>`. /// @@ -656,7 +656,7 @@ impl<T> Weak<T> { } #[unsafe_destructor] -#[experimental = "Weak pointers may not belong in this module."] +#[stable] impl<T> Drop for Weak<T> { /// Drops the `Weak<T>`. /// |
