diff options
| author | bors <bors@rust-lang.org> | 2015-11-23 20:08:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-11-23 20:08:49 +0000 |
| commit | 040a77f772d7693598499a161f53ed230fb61c52 (patch) | |
| tree | 71f1f369c9175a3655dff16f98465da8f2bce375 /src/liballoc | |
| parent | 8e9a97529d9fd112f338501e68e33bac1c41d1a4 (diff) | |
| parent | a613059e3fcfb751f7664f67a4a6c99faf436483 (diff) | |
| download | rust-040a77f772d7693598499a161f53ed230fb61c52.tar.gz rust-040a77f772d7693598499a161f53ed230fb61c52.zip | |
Auto merge of #29952 - petrochenkov:depr, r=brson
Part of https://github.com/rust-lang/rust/issues/29935 The deprecation lint is still called "deprecated", so people can continue using `#[allow(deprecated)]` and similar things.
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/arc.rs | 2 | ||||
| -rw-r--r-- | src/liballoc/lib.rs | 2 | ||||
| -rw-r--r-- | src/liballoc/rc.rs | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/liballoc/arc.rs b/src/liballoc/arc.rs index 7863f101811..dba9b71c61c 100644 --- a/src/liballoc/arc.rs +++ b/src/liballoc/arc.rs @@ -385,7 +385,7 @@ impl<T: ?Sized> Deref for Arc<T> { impl<T: Clone> Arc<T> { #[unstable(feature = "arc_make_unique", reason = "renamed to Arc::make_mut", issue = "27718")] - #[deprecated(since = "1.4.0", reason = "renamed to Arc::make_mut")] + #[rustc_deprecated(since = "1.4.0", reason = "renamed to Arc::make_mut")] pub fn make_unique(this: &mut Self) -> &mut T { Arc::make_mut(this) } diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs index 4113f67e617..3e87b7ebea8 100644 --- a/src/liballoc/lib.rs +++ b/src/liballoc/lib.rs @@ -74,6 +74,8 @@ #![no_std] #![cfg_attr(not(stage0), needs_allocator)] +#![cfg_attr(stage0, feature(rustc_attrs))] +#![cfg_attr(stage0, allow(unused_attributes))] #![feature(allocator)] #![feature(box_syntax)] #![feature(coerce_unsized)] diff --git a/src/liballoc/rc.rs b/src/liballoc/rc.rs index 7abdc447ee5..0ea5ecfda79 100644 --- a/src/liballoc/rc.rs +++ b/src/liballoc/rc.rs @@ -362,7 +362,7 @@ impl<T: Clone> Rc<T> { #[inline] #[unstable(feature = "rc_make_unique", reason = "renamed to Rc::make_mut", issue = "27718")] - #[deprecated(since = "1.4.0", reason = "renamed to Rc::make_mut")] + #[rustc_deprecated(since = "1.4.0", reason = "renamed to Rc::make_mut")] pub fn make_unique(&mut self) -> &mut T { Rc::make_mut(self) } |
