diff options
| author | Brian Anderson <banderson@mozilla.com> | 2015-01-12 18:40:19 -0800 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2015-01-21 16:16:18 -0800 |
| commit | 94ca8a361026d1a622a961e8dc8cacc331ed1ac3 (patch) | |
| tree | 58179e85714f0a1ee618a8a9982aadbeb65822cf /src/liballoc | |
| parent | 90aa581cff54ed1bb5f53ee2ead3764fca94fdf3 (diff) | |
| download | rust-94ca8a361026d1a622a961e8dc8cacc331ed1ac3.tar.gz rust-94ca8a361026d1a622a961e8dc8cacc331ed1ac3.zip | |
Add 'feature' and 'since' to stability attributes
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/arc.rs | 46 | ||||
| -rw-r--r-- | src/liballoc/boxed.rs | 42 | ||||
| -rw-r--r-- | src/liballoc/heap.rs | 2 | ||||
| -rw-r--r-- | src/liballoc/lib.rs | 2 | ||||
| -rw-r--r-- | src/liballoc/rc.rs | 66 |
5 files changed, 85 insertions, 73 deletions
diff --git a/src/liballoc/arc.rs b/src/liballoc/arc.rs index c0cd034abfa..34322f7950c 100644 --- a/src/liballoc/arc.rs +++ b/src/liballoc/arc.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] //! Threadsafe reference-counted boxes (the `Arc<T>` type). //! @@ -110,7 +110,7 @@ use heap::deallocate; /// } /// ``` #[unsafe_no_drop_flag] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Arc<T> { // FIXME #12808: strange name to try to avoid interfering with // field accesses of the contained type via Deref @@ -126,7 +126,8 @@ unsafe impl<T: Sync + Send> Sync for Arc<T> { } /// Weak pointers will not keep the data inside of the `Arc` alive, and can be used to break cycles /// between `Arc` pointers. #[unsafe_no_drop_flag] -#[unstable = "Weak pointers may not belong in this module."] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "Weak pointers may not belong in this module.")] pub struct Weak<T> { // FIXME #12808: strange name to try to avoid interfering with // field accesses of the contained type via Deref @@ -156,7 +157,7 @@ impl<T> Arc<T> { /// let five = Arc::new(5i); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn new(data: T) -> Arc<T> { // Start the weak pointer count as 1 which is the weak pointer that's // held by all the strong pointers (kinda), see std/rc.rs for more info @@ -179,7 +180,8 @@ impl<T> Arc<T> { /// /// let weak_five = five.downgrade(); /// ``` - #[unstable = "Weak pointers may not belong in this module."] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "Weak pointers may not belong in this module.")] pub fn downgrade(&self) -> Weak<T> { // See the clone() impl for why this is relaxed self.inner().weak.fetch_add(1, Relaxed); @@ -200,15 +202,15 @@ impl<T> Arc<T> { /// Get the number of weak references to this value. #[inline] -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn weak_count<T>(this: &Arc<T>) -> uint { this.inner().weak.load(SeqCst) - 1 } /// Get the number of strong references to this value. #[inline] -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn strong_count<T>(this: &Arc<T>) -> uint { this.inner().strong.load(SeqCst) } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<T> Clone for Arc<T> { /// Makes a clone of the `Arc<T>`. /// @@ -245,7 +247,7 @@ impl<T> BorrowFrom<Arc<T>> for T { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<T> Deref for Arc<T> { type Target = T; @@ -271,7 +273,7 @@ impl<T: Send + Sync + Clone> Arc<T> { /// let mut_five = five.make_unique(); /// ``` #[inline] - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn make_unique(&mut self) -> &mut T { // Note that we hold a strong reference, which also counts as a weak reference, so we only // clone if there is an additional reference of either kind. @@ -289,7 +291,7 @@ impl<T: Send + Sync + Clone> Arc<T> { } #[unsafe_destructor] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<T: Sync + Send> Drop for Arc<T> { /// Drops the `Arc<T>`. /// @@ -355,7 +357,8 @@ impl<T: Sync + Send> Drop for Arc<T> { } } -#[unstable = "Weak pointers may not belong in this module."] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "Weak pointers may not belong in this module.")] impl<T: Sync + Send> Weak<T> { /// Upgrades a weak reference to a strong reference. /// @@ -393,7 +396,8 @@ impl<T: Sync + Send> Weak<T> { } } -#[unstable = "Weak pointers may not belong in this module."] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "Weak pointers may not belong in this module.")] impl<T: Sync + Send> Clone for Weak<T> { /// Makes a clone of the `Weak<T>`. /// @@ -417,7 +421,7 @@ impl<T: Sync + Send> Clone for Weak<T> { } #[unsafe_destructor] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<T: Sync + Send> Drop for Weak<T> { /// Drops the `Weak<T>`. /// @@ -460,7 +464,7 @@ impl<T: Sync + Send> Drop for Weak<T> { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<T: PartialEq> PartialEq for Arc<T> { /// Equality for two `Arc<T>`s. /// @@ -492,7 +496,7 @@ impl<T: PartialEq> PartialEq for Arc<T> { /// ``` fn ne(&self, other: &Arc<T>) -> bool { *(*self) != *(*other) } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<T: PartialOrd> PartialOrd for Arc<T> { /// Partial comparison for two `Arc<T>`s. /// @@ -571,11 +575,11 @@ impl<T: PartialOrd> PartialOrd for Arc<T> { /// ``` fn ge(&self, other: &Arc<T>) -> bool { *(*self) >= *(*other) } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<T: Ord> Ord for Arc<T> { fn cmp(&self, other: &Arc<T>) -> Ordering { (**self).cmp(&**other) } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<T: Eq> Eq for Arc<T> {} impl<T: fmt::Show> fmt::Show for Arc<T> { @@ -584,16 +588,16 @@ impl<T: fmt::Show> fmt::Show for Arc<T> { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<T: fmt::String> fmt::String for Arc<T> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fmt::String::fmt(&**self, f) } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<T: Default + Sync + Send> Default for Arc<T> { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn default() -> Arc<T> { Arc::new(Default::default()) } } diff --git a/src/liballoc/boxed.rs b/src/liballoc/boxed.rs index a2cc98c7d01..6f41ccbf415 100644 --- a/src/liballoc/boxed.rs +++ b/src/liballoc/boxed.rs @@ -10,7 +10,7 @@ //! A unique pointer type. -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] use core::any::Any; use core::clone::Clone; @@ -44,35 +44,36 @@ use core::ops::{Deref, DerefMut}; /// } /// ``` #[lang = "exchange_heap"] -#[unstable = "may be renamed; uncertain about custom allocator design"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "may be renamed; uncertain about custom allocator design")] pub static HEAP: () = (); /// A type that represents a uniquely-owned value. #[lang = "owned_box"] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Box<T>(Unique<T>); impl<T> Box<T> { /// Moves `x` into a freshly allocated box on the global exchange heap. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn new(x: T) -> Box<T> { box x } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<T: Default> Default for Box<T> { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn default() -> Box<T> { box Default::default() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<T> Default for Box<[T]> { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn default() -> Box<[T]> { box [] } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<T: Clone> Clone for Box<T> { /// Returns a copy of the owned box. #[inline] @@ -85,14 +86,14 @@ impl<T: Clone> Clone for Box<T> { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<T: ?Sized + PartialEq> PartialEq for Box<T> { #[inline] fn eq(&self, other: &Box<T>) -> bool { PartialEq::eq(&**self, &**other) } #[inline] fn ne(&self, other: &Box<T>) -> bool { PartialEq::ne(&**self, &**other) } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<T: ?Sized + PartialOrd> PartialOrd for Box<T> { #[inline] fn partial_cmp(&self, other: &Box<T>) -> Option<Ordering> { @@ -107,14 +108,14 @@ impl<T: ?Sized + PartialOrd> PartialOrd for Box<T> { #[inline] fn gt(&self, other: &Box<T>) -> bool { PartialOrd::gt(&**self, &**other) } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<T: ?Sized + Ord> Ord for Box<T> { #[inline] fn cmp(&self, other: &Box<T>) -> Ordering { Ord::cmp(&**self, &**other) } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<T: ?Sized + Eq> Eq for Box<T> {} impl<S: hash::Hasher, T: ?Sized + Hash<S>> Hash<S> for Box<T> { @@ -125,19 +126,20 @@ impl<S: hash::Hasher, T: ?Sized + Hash<S>> Hash<S> for Box<T> { } /// Extension methods for an owning `Any` trait object. -#[unstable = "this trait will likely disappear once compiler bugs blocking \ - a direct impl on `Box<Any>` have been fixed "] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "this trait will likely disappear once compiler bugs blocking \ + a direct impl on `Box<Any>` have been fixed ")] // FIXME(#18737): this should be a direct impl on `Box<Any>`. If you're // removing this please make sure that you can downcase on // `Box<Any + Send>` as well as `Box<Any>` pub trait BoxAny { /// Returns the boxed value if it is of type `T`, or /// `Err(Self)` if it isn't. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn downcast<T: 'static>(self) -> Result<Box<T>, Self>; } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl BoxAny for Box<Any> { #[inline] fn downcast<T: 'static>(self) -> Result<Box<T>, Box<Any>> { @@ -162,7 +164,7 @@ impl<T: ?Sized + fmt::Show> fmt::Show for Box<T> { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<T: ?Sized + fmt::String> fmt::String for Box<T> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fmt::String::fmt(&**self, f) @@ -175,14 +177,14 @@ impl fmt::Show for Box<Any> { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<T: ?Sized> Deref for Box<T> { type Target = T; fn deref(&self) -> &T { &**self } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<T: ?Sized> DerefMut for Box<T> { fn deref_mut(&mut self) -> &mut T { &mut **self } } diff --git a/src/liballoc/heap.rs b/src/liballoc/heap.rs index bd5b43b782e..0cb97410562 100644 --- a/src/liballoc/heap.rs +++ b/src/liballoc/heap.rs @@ -80,7 +80,7 @@ pub fn usable_size(size: uint, align: uint) -> uint { /// /// These statistics may be inconsistent if other threads use the allocator /// during the call. -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn stats_print() { imp::stats_print(); } diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs index 811e32e747d..84527893374 100644 --- a/src/liballoc/lib.rs +++ b/src/liballoc/lib.rs @@ -57,7 +57,7 @@ //! default global allocator. It is not compatible with the libc allocator API. #![crate_name = "alloc"] -#![unstable] +#![unstable(feature = "unnamed_feature", since = "1.0.0")] #![staged_api] #![crate_type = "rlib"] #![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png", diff --git a/src/liballoc/rc.rs b/src/liballoc/rc.rs index 7191a7af346..0b8c518a3a5 100644 --- a/src/liballoc/rc.rs +++ b/src/liballoc/rc.rs @@ -142,7 +142,7 @@ //! } //! ``` -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] use core::borrow::BorrowFrom; use core::cell::Cell; @@ -173,8 +173,8 @@ struct RcBox<T> { /// /// See the [module level documentation](../index.html) for more details. #[unsafe_no_drop_flag] -#[stable] #[cfg(stage0)] // NOTE remove impl after next snapshot +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Rc<T> { // FIXME #12808: strange names to try to avoid interfering with field accesses of the contained // type via Deref @@ -187,7 +187,7 @@ pub struct Rc<T> { /// /// See the [module level documentation](../index.html) for more details. #[unsafe_no_drop_flag] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] #[cfg(not(stage0))] // NOTE remove cfg after next snapshot pub struct Rc<T> { // FIXME #12808: strange names to try to avoid interfering with field accesses of the contained @@ -211,8 +211,8 @@ impl<T> Rc<T> { /// /// let five = Rc::new(5i); /// ``` - #[stable] #[cfg(stage0)] // NOTE remove after next snapshot + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn new(value: T) -> Rc<T> { unsafe { Rc { @@ -239,7 +239,7 @@ impl<T> Rc<T> { /// /// let five = Rc::new(5i); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] #[cfg(not(stage0))] // NOTE remove cfg after next snapshot pub fn new(value: T) -> Rc<T> { unsafe { @@ -268,7 +268,8 @@ impl<T> Rc<T> { /// let weak_five = five.downgrade(); /// ``` #[cfg(stage0)] // NOTE remove after next snapshot - #[unstable = "Weak pointers may not belong in this module"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "Weak pointers may not belong in this module")] pub fn downgrade(&self) -> Weak<T> { self.inc_weak(); Weak { @@ -290,7 +291,8 @@ impl<T> Rc<T> { /// let weak_five = five.downgrade(); /// ``` #[cfg(not(stage0))] // NOTE remove cfg after next snapshot - #[unstable = "Weak pointers may not belong in this module"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "Weak pointers may not belong in this module")] pub fn downgrade(&self) -> Weak<T> { self.inc_weak(); Weak { _ptr: self._ptr } @@ -299,12 +301,12 @@ impl<T> Rc<T> { /// Get the number of weak references to this value. #[inline] -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn weak_count<T>(this: &Rc<T>) -> uint { this.weak() - 1 } /// Get the number of strong references to this value. #[inline] -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn strong_count<T>(this: &Rc<T>) -> uint { this.strong() } /// Returns true if there are no other `Rc` or `Weak<T>` values that share the same inner value. @@ -320,7 +322,7 @@ pub fn strong_count<T>(this: &Rc<T>) -> uint { this.strong() } /// rc::is_unique(&five); /// ``` #[inline] -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn is_unique<T>(rc: &Rc<T>) -> bool { weak_count(rc) == 0 && strong_count(rc) == 1 } @@ -342,7 +344,7 @@ pub fn is_unique<T>(rc: &Rc<T>) -> bool { /// assert_eq!(rc::try_unwrap(x), Err(Rc::new(4u))); /// ``` #[inline] -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn try_unwrap<T>(rc: Rc<T>) -> Result<T, Rc<T>> { if is_unique(&rc) { unsafe { @@ -376,7 +378,7 @@ pub fn try_unwrap<T>(rc: Rc<T>) -> Result<T, Rc<T>> { /// assert!(rc::get_mut(&mut x).is_none()); /// ``` #[inline] -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn get_mut<'a, T>(rc: &'a mut Rc<T>) -> Option<&'a mut T> { if is_unique(rc) { let inner = unsafe { &mut **rc._ptr }; @@ -402,7 +404,7 @@ impl<T: Clone> Rc<T> { /// let mut_five = five.make_unique(); /// ``` #[inline] - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn make_unique(&mut self) -> &mut T { if !is_unique(self) { *self = Rc::new((**self).clone()) @@ -422,7 +424,7 @@ impl<T> BorrowFrom<Rc<T>> for T { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<T> Deref for Rc<T> { type Target = T; @@ -433,7 +435,7 @@ impl<T> Deref for Rc<T> { } #[unsafe_destructor] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<T> Drop for Rc<T> { /// Drops the `Rc<T>`. /// @@ -481,7 +483,7 @@ impl<T> Drop for Rc<T> { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<T> Clone for Rc<T> { /// Makes a clone of the `Rc<T>`. /// @@ -524,7 +526,7 @@ impl<T> Clone for Rc<T> { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<T: Default> Default for Rc<T> { /// Creates a new `Rc<T>`, with the `Default` value for `T`. /// @@ -537,13 +539,13 @@ impl<T: Default> Default for Rc<T> { /// let x: Rc<int> = Default::default(); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn default() -> Rc<T> { Rc::new(Default::default()) } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<T: PartialEq> PartialEq for Rc<T> { /// Equality for two `Rc<T>`s. /// @@ -578,10 +580,10 @@ impl<T: PartialEq> PartialEq for Rc<T> { fn ne(&self, other: &Rc<T>) -> bool { **self != **other } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<T: Eq> Eq for Rc<T> {} -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<T: PartialOrd> PartialOrd for Rc<T> { /// Partial comparison for two `Rc<T>`s. /// @@ -666,7 +668,7 @@ impl<T: PartialOrd> PartialOrd for Rc<T> { fn ge(&self, other: &Rc<T>) -> bool { **self >= **other } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<T: Ord> Ord for Rc<T> { /// Comparison for two `Rc<T>`s. /// @@ -693,14 +695,14 @@ impl<S: hash::Hasher, T: Hash<S>> Hash<S> for Rc<T> { } } -#[unstable = "Show is experimental."] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "Show is experimental.")] impl<T: fmt::Show> fmt::Show for Rc<T> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { write!(f, "Rc({:?})", **self) } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<T: fmt::String> fmt::String for Rc<T> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fmt::String::fmt(&**self, f) @@ -713,8 +715,9 @@ impl<T: fmt::String> fmt::String for Rc<T> { /// /// See the [module level documentation](../index.html) for more. #[unsafe_no_drop_flag] -#[unstable = "Weak pointers may not belong in this module."] #[cfg(stage0)] // NOTE remove impl after next snapshot +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "Weak pointers may not belong in this module.")] pub struct Weak<T> { // FIXME #12808: strange names to try to avoid interfering with // field accesses of the contained type via Deref @@ -729,7 +732,8 @@ pub struct Weak<T> { /// /// See the [module level documentation](../index.html) for more. #[unsafe_no_drop_flag] -#[unstable = "Weak pointers may not belong in this module."] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "Weak pointers may not belong in this module.")] #[cfg(not(stage0))] // NOTE remove cfg after next snapshot pub struct Weak<T> { // FIXME #12808: strange names to try to avoid interfering with @@ -746,7 +750,8 @@ impl<T> !marker::Send for Weak<T> {} impl<T> !marker::Sync for Weak<T> {} -#[unstable = "Weak pointers may not belong in this module."] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "Weak pointers may not belong in this module.")] impl<T> Weak<T> { /// Upgrades a weak reference to a strong reference. /// @@ -804,7 +809,7 @@ impl<T> Weak<T> { } #[unsafe_destructor] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<T> Drop for Weak<T> { /// Drops the `Weak<T>`. /// @@ -847,7 +852,8 @@ impl<T> Drop for Weak<T> { } } -#[unstable = "Weak pointers may not belong in this module."] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "Weak pointers may not belong in this module.")] impl<T> Clone for Weak<T> { /// Makes a clone of the `Weak<T>`. /// @@ -890,7 +896,7 @@ impl<T> Clone for Weak<T> { } } -#[unstable = "Show is experimental."] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "Show is experimental.")] impl<T: fmt::Show> fmt::Show for Weak<T> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { write!(f, "(Weak)") |
