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` type). //! @@ -110,7 +110,7 @@ use heap::deallocate; /// } /// ``` #[unsafe_no_drop_flag] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Arc { // FIXME #12808: strange name to try to avoid interfering with // field accesses of the contained type via Deref @@ -126,7 +126,8 @@ unsafe impl Sync for Arc { } /// 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 { // FIXME #12808: strange name to try to avoid interfering with // field accesses of the contained type via Deref @@ -156,7 +157,7 @@ impl Arc { /// let five = Arc::new(5i); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn new(data: T) -> Arc { // 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 Arc { /// /// 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 { // See the clone() impl for why this is relaxed self.inner().weak.fetch_add(1, Relaxed); @@ -200,15 +202,15 @@ impl Arc { /// Get the number of weak references to this value. #[inline] -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn weak_count(this: &Arc) -> 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(this: &Arc) -> uint { this.inner().strong.load(SeqCst) } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Clone for Arc { /// Makes a clone of the `Arc`. /// @@ -245,7 +247,7 @@ impl BorrowFrom> for T { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Deref for Arc { type Target = T; @@ -271,7 +273,7 @@ impl Arc { /// 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 Arc { } #[unsafe_destructor] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Drop for Arc { /// Drops the `Arc`. /// @@ -355,7 +357,8 @@ impl Drop for Arc { } } -#[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 Weak { /// Upgrades a weak reference to a strong reference. /// @@ -393,7 +396,8 @@ impl Weak { } } -#[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 Clone for Weak { /// Makes a clone of the `Weak`. /// @@ -417,7 +421,7 @@ impl Clone for Weak { } #[unsafe_destructor] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Drop for Weak { /// Drops the `Weak`. /// @@ -460,7 +464,7 @@ impl Drop for Weak { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl PartialEq for Arc { /// Equality for two `Arc`s. /// @@ -492,7 +496,7 @@ impl PartialEq for Arc { /// ``` fn ne(&self, other: &Arc) -> bool { *(*self) != *(*other) } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl PartialOrd for Arc { /// Partial comparison for two `Arc`s. /// @@ -571,11 +575,11 @@ impl PartialOrd for Arc { /// ``` fn ge(&self, other: &Arc) -> bool { *(*self) >= *(*other) } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Ord for Arc { fn cmp(&self, other: &Arc) -> Ordering { (**self).cmp(&**other) } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Eq for Arc {} impl fmt::Show for Arc { @@ -584,16 +588,16 @@ impl fmt::Show for Arc { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl fmt::String for Arc { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fmt::String::fmt(&**self, f) } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Default for Arc { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn default() -> Arc { 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(Unique); impl Box { /// 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 { box x } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Default for Box { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn default() -> Box { box Default::default() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl 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 Clone for Box { /// Returns a copy of the owned box. #[inline] @@ -85,14 +86,14 @@ impl Clone for Box { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl PartialEq for Box { #[inline] fn eq(&self, other: &Box) -> bool { PartialEq::eq(&**self, &**other) } #[inline] fn ne(&self, other: &Box) -> bool { PartialEq::ne(&**self, &**other) } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl PartialOrd for Box { #[inline] fn partial_cmp(&self, other: &Box) -> Option { @@ -107,14 +108,14 @@ impl PartialOrd for Box { #[inline] fn gt(&self, other: &Box) -> bool { PartialOrd::gt(&**self, &**other) } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Ord for Box { #[inline] fn cmp(&self, other: &Box) -> Ordering { Ord::cmp(&**self, &**other) } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Eq for Box {} impl> Hash for Box { @@ -125,19 +126,20 @@ impl> Hash for Box { } /// Extension methods for an owning `Any` trait object. -#[unstable = "this trait will likely disappear once compiler bugs blocking \ - a direct impl on `Box` 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` have been fixed ")] // FIXME(#18737): this should be a direct impl on `Box`. If you're // removing this please make sure that you can downcase on // `Box` as well as `Box` 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(self) -> Result, Self>; } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl BoxAny for Box { #[inline] fn downcast(self) -> Result, Box> { @@ -162,7 +164,7 @@ impl fmt::Show for Box { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl fmt::String for Box { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fmt::String::fmt(&**self, f) @@ -175,14 +177,14 @@ impl fmt::Show for Box { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Deref for Box { type Target = T; fn deref(&self) -> &T { &**self } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl DerefMut for Box { 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 { /// /// 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 { // 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 { /// /// 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 { // FIXME #12808: strange names to try to avoid interfering with field accesses of the contained @@ -211,8 +211,8 @@ impl Rc { /// /// 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 { unsafe { Rc { @@ -239,7 +239,7 @@ impl Rc { /// /// 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 { unsafe { @@ -268,7 +268,8 @@ impl Rc { /// 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 { self.inc_weak(); Weak { @@ -290,7 +291,8 @@ impl Rc { /// 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 { self.inc_weak(); Weak { _ptr: self._ptr } @@ -299,12 +301,12 @@ impl Rc { /// Get the number of weak references to this value. #[inline] -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn weak_count(this: &Rc) -> 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(this: &Rc) -> uint { this.strong() } /// Returns true if there are no other `Rc` or `Weak` values that share the same inner value. @@ -320,7 +322,7 @@ pub fn strong_count(this: &Rc) -> uint { this.strong() } /// rc::is_unique(&five); /// ``` #[inline] -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn is_unique(rc: &Rc) -> bool { weak_count(rc) == 0 && strong_count(rc) == 1 } @@ -342,7 +344,7 @@ pub fn is_unique(rc: &Rc) -> 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(rc: Rc) -> Result> { if is_unique(&rc) { unsafe { @@ -376,7 +378,7 @@ pub fn try_unwrap(rc: Rc) -> Result> { /// 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) -> Option<&'a mut T> { if is_unique(rc) { let inner = unsafe { &mut **rc._ptr }; @@ -402,7 +404,7 @@ impl Rc { /// 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 BorrowFrom> for T { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Deref for Rc { type Target = T; @@ -433,7 +435,7 @@ impl Deref for Rc { } #[unsafe_destructor] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Drop for Rc { /// Drops the `Rc`. /// @@ -481,7 +483,7 @@ impl Drop for Rc { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Clone for Rc { /// Makes a clone of the `Rc`. /// @@ -524,7 +526,7 @@ impl Clone for Rc { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Default for Rc { /// Creates a new `Rc`, with the `Default` value for `T`. /// @@ -537,13 +539,13 @@ impl Default for Rc { /// let x: Rc = Default::default(); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn default() -> Rc { Rc::new(Default::default()) } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl PartialEq for Rc { /// Equality for two `Rc`s. /// @@ -578,10 +580,10 @@ impl PartialEq for Rc { fn ne(&self, other: &Rc) -> bool { **self != **other } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Eq for Rc {} -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl PartialOrd for Rc { /// Partial comparison for two `Rc`s. /// @@ -666,7 +668,7 @@ impl PartialOrd for Rc { fn ge(&self, other: &Rc) -> bool { **self >= **other } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Ord for Rc { /// Comparison for two `Rc`s. /// @@ -693,14 +695,14 @@ impl> Hash for Rc { } } -#[unstable = "Show is experimental."] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "Show is experimental.")] impl fmt::Show for Rc { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { write!(f, "Rc({:?})", **self) } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl fmt::String for Rc { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fmt::String::fmt(&**self, f) @@ -713,8 +715,9 @@ impl fmt::String for Rc { /// /// 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 { // 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 { /// /// 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 { // FIXME #12808: strange names to try to avoid interfering with @@ -746,7 +750,8 @@ impl !marker::Send for Weak {} impl !marker::Sync for Weak {} -#[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 Weak { /// Upgrades a weak reference to a strong reference. /// @@ -804,7 +809,7 @@ impl Weak { } #[unsafe_destructor] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Drop for Weak { /// Drops the `Weak`. /// @@ -847,7 +852,8 @@ impl Drop for Weak { } } -#[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 Clone for Weak { /// Makes a clone of the `Weak`. /// @@ -890,7 +896,7 @@ impl Clone for Weak { } } -#[unstable = "Show is experimental."] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "Show is experimental.")] impl fmt::Show for Weak { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { write!(f, "(Weak)") diff --git a/src/libarena/lib.rs b/src/libarena/lib.rs index 7458cc60c15..633e2bf57b6 100644 --- a/src/libarena/lib.rs +++ b/src/libarena/lib.rs @@ -20,7 +20,7 @@ //! more complex, slower arena which can hold objects of any type. #![crate_name = "arena"] -#![unstable] +#![unstable(feature = "unnamed_feature", since = "1.0.0")] #![staged_api] #![crate_type = "rlib"] #![crate_type = "dylib"] diff --git a/src/libcollections/binary_heap.rs b/src/libcollections/binary_heap.rs index 01693391abe..fb7fa895ae3 100644 --- a/src/libcollections/binary_heap.rs +++ b/src/libcollections/binary_heap.rs @@ -148,7 +148,7 @@ //! ``` #![allow(missing_docs)] -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] use core::prelude::*; @@ -164,12 +164,12 @@ use vec::{self, Vec}; /// /// This will be a max-heap. #[derive(Clone)] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct BinaryHeap { data: Vec, } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Default for BinaryHeap { #[inline] fn default() -> BinaryHeap { BinaryHeap::new() } @@ -185,7 +185,7 @@ impl BinaryHeap { /// let mut heap = BinaryHeap::new(); /// heap.push(4u); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn new() -> BinaryHeap { BinaryHeap { data: vec![] } } /// Creates an empty `BinaryHeap` with a specific capacity. @@ -200,7 +200,7 @@ impl BinaryHeap { /// let mut heap = BinaryHeap::with_capacity(10); /// heap.push(4u); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn with_capacity(capacity: uint) -> BinaryHeap { BinaryHeap { data: Vec::with_capacity(capacity) } } @@ -238,7 +238,7 @@ impl BinaryHeap { /// println!("{}", x); /// } /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn iter(&self) -> Iter { Iter { iter: self.data.iter() } } @@ -259,7 +259,7 @@ impl BinaryHeap { /// println!("{}", x); /// } /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn into_iter(self) -> IntoIter { IntoIter { iter: self.data.into_iter() } } @@ -279,7 +279,7 @@ impl BinaryHeap { /// assert_eq!(heap.peek(), Some(&5)); /// /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn peek(&self) -> Option<&T> { self.data.get(0) } @@ -294,7 +294,7 @@ impl BinaryHeap { /// assert!(heap.capacity() >= 100); /// heap.push(4u); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn capacity(&self) -> uint { self.data.capacity() } /// Reserves the minimum capacity for exactly `additional` more elements to be inserted in the @@ -317,7 +317,7 @@ impl BinaryHeap { /// assert!(heap.capacity() >= 100); /// heap.push(4u); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn reserve_exact(&mut self, additional: uint) { self.data.reserve_exact(additional); } @@ -338,13 +338,13 @@ impl BinaryHeap { /// assert!(heap.capacity() >= 100); /// heap.push(4u); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn reserve(&mut self, additional: uint) { self.data.reserve(additional); } /// Discards as much additional capacity as possible. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn shrink_to_fit(&mut self) { self.data.shrink_to_fit(); } @@ -362,7 +362,7 @@ impl BinaryHeap { /// assert_eq!(heap.pop(), Some(1)); /// assert_eq!(heap.pop(), None); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn pop(&mut self) -> Option { self.data.pop().map(|mut item| { if !self.is_empty() { @@ -387,7 +387,7 @@ impl BinaryHeap { /// assert_eq!(heap.len(), 3); /// assert_eq!(heap.peek(), Some(&5)); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn push(&mut self, item: T) { let old_len = self.len(); self.data.push(item); @@ -542,40 +542,41 @@ impl BinaryHeap { } /// Returns the length of the binary heap. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn len(&self) -> uint { self.data.len() } /// Checks if the binary heap is empty. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn is_empty(&self) -> bool { self.len() == 0 } /// Clears the binary heap, returning an iterator over the removed elements. #[inline] - #[unstable = "matches collection reform specification, waiting for dust to settle"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "matches collection reform specification, waiting for dust to settle")] pub fn drain(&mut self) -> Drain { Drain { iter: self.data.drain() } } /// Drops all items from the binary heap. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn clear(&mut self) { self.drain(); } } /// `BinaryHeap` iterator. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Iter <'a, T: 'a> { iter: slice::Iter<'a, T>, } // FIXME(#19839) Remove in favor of `#[derive(Clone)]` -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T> Clone for Iter<'a, T> { fn clone(&self) -> Iter<'a, T> { Iter { iter: self.iter.clone() } } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T> Iterator for Iter<'a, T> { type Item = &'a T; @@ -586,22 +587,22 @@ impl<'a, T> Iterator for Iter<'a, T> { fn size_hint(&self) -> (uint, Option) { self.iter.size_hint() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T> DoubleEndedIterator for Iter<'a, T> { #[inline] fn next_back(&mut self) -> Option<&'a T> { self.iter.next_back() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T> ExactSizeIterator for Iter<'a, T> {} /// An iterator that moves out of a `BinaryHeap`. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct IntoIter { iter: vec::IntoIter, } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Iterator for IntoIter { type Item = T; @@ -612,22 +613,22 @@ impl Iterator for IntoIter { fn size_hint(&self) -> (uint, Option) { self.iter.size_hint() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl DoubleEndedIterator for IntoIter { #[inline] fn next_back(&mut self) -> Option { self.iter.next_back() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl ExactSizeIterator for IntoIter {} /// An iterator that drains a `BinaryHeap`. -#[unstable = "recent addition"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "recent addition")] pub struct Drain<'a, T: 'a> { iter: vec::Drain<'a, T>, } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T: 'a> Iterator for Drain<'a, T> { type Item = T; @@ -638,23 +639,23 @@ impl<'a, T: 'a> Iterator for Drain<'a, T> { fn size_hint(&self) -> (uint, Option) { self.iter.size_hint() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T: 'a> DoubleEndedIterator for Drain<'a, T> { #[inline] fn next_back(&mut self) -> Option { self.iter.next_back() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T: 'a> ExactSizeIterator for Drain<'a, T> {} -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl FromIterator for BinaryHeap { fn from_iter>(iter: Iter) -> BinaryHeap { BinaryHeap::from_vec(iter.collect()) } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Extend for BinaryHeap { fn extend>(&mut self, mut iter: Iter) { let (lower, _) = iter.size_hint(); diff --git a/src/libcollections/bit.rs b/src/libcollections/bit.rs index efd056b0d66..8911f67a35f 100644 --- a/src/libcollections/bit.rs +++ b/src/libcollections/bit.rs @@ -156,7 +156,8 @@ static FALSE: bool = false; /// println!("{:?}", bv); /// println!("total bits set to true: {}", bv.iter().filter(|x| *x).count()); /// ``` -#[unstable = "RFC 509"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "RFC 509")] pub struct Bitv { /// Internal representation of the bit vector storage: Vec, @@ -252,7 +253,7 @@ impl Bitv { /// use std::collections::Bitv; /// let mut bv = Bitv::new(); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn new() -> Bitv { Bitv { storage: Vec::new(), nbits: 0 } } @@ -288,7 +289,7 @@ impl Bitv { /// /// It is important to note that this function does not specify the /// *length* of the returned bitvector, but only the *capacity*. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn with_capacity(nbits: uint) -> Bitv { Bitv { storage: Vec::with_capacity(blocks_for_bits(nbits)), @@ -374,7 +375,7 @@ impl Bitv { /// assert_eq!(bv[1], true); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn get(&self, i: uint) -> Option { if i >= self.nbits { return None; @@ -402,7 +403,8 @@ impl Bitv { /// assert_eq!(bv[3], true); /// ``` #[inline] - #[unstable = "panic semantics are likely to change in the future"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "panic semantics are likely to change in the future")] pub fn set(&mut self, i: uint, x: bool) { assert!(i < self.nbits); let w = i / u32::BITS; @@ -585,7 +587,7 @@ impl Bitv { /// assert_eq!(bv.iter().filter(|x| *x).count(), 7); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn iter(&self) -> Iter { Iter { bitv: self, next_idx: 0, end_idx: self.nbits } } @@ -706,7 +708,7 @@ impl Bitv { /// bv.truncate(2); /// assert!(bv.eq_vec(&[false, true])); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn truncate(&mut self, len: uint) { if len < self.len() { self.nbits = len; @@ -733,7 +735,7 @@ impl Bitv { /// assert_eq!(bv.len(), 3); /// assert!(bv.capacity() >= 13); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn reserve(&mut self, additional: uint) { let desired_cap = self.len().checked_add(additional).expect("capacity overflow"); let storage_len = self.storage.len(); @@ -763,7 +765,7 @@ impl Bitv { /// assert_eq!(bv.len(), 3); /// assert!(bv.capacity() >= 13); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn reserve_exact(&mut self, additional: uint) { let desired_cap = self.len().checked_add(additional).expect("capacity overflow"); let storage_len = self.storage.len(); @@ -785,7 +787,7 @@ impl Bitv { /// assert!(bv.capacity() >= 10); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn capacity(&self) -> uint { self.storage.capacity().checked_mul(u32::BITS).unwrap_or(uint::MAX) } @@ -856,7 +858,7 @@ impl Bitv { /// assert_eq!(bv.pop(), Some(false)); /// assert_eq!(bv.len(), 6); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn pop(&mut self) -> Option { if self.is_empty() { None @@ -886,7 +888,7 @@ impl Bitv { /// bv.push(false); /// assert!(bv.eq_vec(&[true, false])); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn push(&mut self, elem: bool) { if self.nbits % u32::BITS == 0 { self.storage.push(0); @@ -898,29 +900,29 @@ impl Bitv { /// Return the total number of bits in this vector #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn len(&self) -> uint { self.nbits } /// Returns true if there are no bits in this vector #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn is_empty(&self) -> bool { self.len() == 0 } /// Clears all bits in this vector. #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn clear(&mut self) { for w in self.storage.iter_mut() { *w = 0u32; } } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Default for Bitv { #[inline] fn default() -> Bitv { Bitv::new() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl FromIterator for Bitv { fn from_iter>(iterator: I) -> Bitv { let mut ret = Bitv::new(); @@ -929,7 +931,7 @@ impl FromIterator for Bitv { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Extend for Bitv { #[inline] fn extend>(&mut self, mut iterator: I) { @@ -941,7 +943,7 @@ impl Extend for Bitv { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Clone for Bitv { #[inline] fn clone(&self) -> Bitv { @@ -955,7 +957,7 @@ impl Clone for Bitv { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl PartialOrd for Bitv { #[inline] fn partial_cmp(&self, other: &Bitv) -> Option { @@ -963,7 +965,7 @@ impl PartialOrd for Bitv { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Ord for Bitv { #[inline] fn cmp(&self, other: &Bitv) -> Ordering { @@ -971,7 +973,7 @@ impl Ord for Bitv { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl fmt::Show for Bitv { fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { for bit in self.iter() { @@ -981,7 +983,7 @@ impl fmt::Show for Bitv { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl hash::Hash for Bitv { fn hash(&self, state: &mut S) { self.nbits.hash(state); @@ -991,7 +993,7 @@ impl hash::Hash for Bitv { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl cmp::PartialEq for Bitv { #[inline] fn eq(&self, other: &Bitv) -> bool { @@ -1002,11 +1004,11 @@ impl cmp::PartialEq for Bitv { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl cmp::Eq for Bitv {} /// An iterator for `Bitv`. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] #[derive(Clone)] pub struct Iter<'a> { bitv: &'a Bitv, @@ -1014,7 +1016,7 @@ pub struct Iter<'a> { end_idx: uint, } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a> Iterator for Iter<'a> { type Item = bool; @@ -1035,7 +1037,7 @@ impl<'a> Iterator for Iter<'a> { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a> DoubleEndedIterator for Iter<'a> { #[inline] fn next_back(&mut self) -> Option { @@ -1048,10 +1050,10 @@ impl<'a> DoubleEndedIterator for Iter<'a> { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a> ExactSizeIterator for Iter<'a> {} -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a> RandomAccessIterator for Iter<'a> { #[inline] fn indexable(&self) -> uint { @@ -1107,18 +1109,19 @@ impl<'a> RandomAccessIterator for Iter<'a> { /// assert!(bv[3]); /// ``` #[derive(Clone)] -#[unstable = "RFC 509"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "RFC 509")] pub struct BitvSet { bitv: Bitv, } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Default for BitvSet { #[inline] fn default() -> BitvSet { BitvSet::new() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl FromIterator for BitvSet { fn from_iter>(iterator: I) -> BitvSet { let mut ret = BitvSet::new(); @@ -1127,7 +1130,7 @@ impl FromIterator for BitvSet { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Extend for BitvSet { #[inline] fn extend>(&mut self, mut iterator: I) { @@ -1137,7 +1140,7 @@ impl Extend for BitvSet { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl PartialOrd for BitvSet { #[inline] fn partial_cmp(&self, other: &BitvSet) -> Option { @@ -1146,7 +1149,7 @@ impl PartialOrd for BitvSet { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Ord for BitvSet { #[inline] fn cmp(&self, other: &BitvSet) -> Ordering { @@ -1155,7 +1158,7 @@ impl Ord for BitvSet { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl cmp::PartialEq for BitvSet { #[inline] fn eq(&self, other: &BitvSet) -> bool { @@ -1164,7 +1167,7 @@ impl cmp::PartialEq for BitvSet { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl cmp::Eq for BitvSet {} impl BitvSet { @@ -1178,7 +1181,7 @@ impl BitvSet { /// let mut s = BitvSet::new(); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn new() -> BitvSet { BitvSet { bitv: Bitv::new() } } @@ -1195,7 +1198,7 @@ impl BitvSet { /// assert!(s.capacity() >= 100); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn with_capacity(nbits: uint) -> BitvSet { let bitv = Bitv::from_elem(nbits, false); BitvSet::from_bitv(bitv) @@ -1233,7 +1236,7 @@ impl BitvSet { /// assert!(s.capacity() >= 100); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn capacity(&self) -> uint { self.bitv.capacity() } @@ -1254,7 +1257,7 @@ impl BitvSet { /// s.reserve_len(10); /// assert!(s.capacity() >= 10); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn reserve_len(&mut self, len: uint) { let cur_len = self.bitv.len(); if len >= cur_len { @@ -1280,7 +1283,7 @@ impl BitvSet { /// s.reserve_len_exact(10); /// assert!(s.capacity() >= 10); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn reserve_len_exact(&mut self, len: uint) { let cur_len = self.bitv.len(); if len >= cur_len { @@ -1374,7 +1377,7 @@ impl BitvSet { /// println!("new capacity: {}", s.capacity()); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn shrink_to_fit(&mut self) { let bitv = &mut self.bitv; // Obtain original length @@ -1402,7 +1405,7 @@ impl BitvSet { /// } /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn iter(&self) -> bitv_set::Iter { SetIter {set: self, next_idx: 0u} } @@ -1424,7 +1427,7 @@ impl BitvSet { /// } /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn union<'a>(&'a self, other: &'a BitvSet) -> Union<'a> { fn or(w1: u32, w2: u32) -> u32 { w1 | w2 } @@ -1454,7 +1457,7 @@ impl BitvSet { /// } /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn intersection<'a>(&'a self, other: &'a BitvSet) -> Intersection<'a> { fn bitand(w1: u32, w2: u32) -> u32 { w1 & w2 } let min = cmp::min(self.bitv.len(), other.bitv.len()); @@ -1491,7 +1494,7 @@ impl BitvSet { /// } /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn difference<'a>(&'a self, other: &'a BitvSet) -> Difference<'a> { fn diff(w1: u32, w2: u32) -> u32 { w1 & !w2 } @@ -1522,7 +1525,7 @@ impl BitvSet { /// } /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn symmetric_difference<'a>(&'a self, other: &'a BitvSet) -> SymmetricDifference<'a> { fn bitxor(w1: u32, w2: u32) -> u32 { w1 ^ w2 } @@ -1639,28 +1642,28 @@ impl BitvSet { /// Return the number of set bits in this set. #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn len(&self) -> uint { self.bitv.blocks().fold(0, |acc, n| acc + n.count_ones()) } /// Returns whether there are no bits set in this set #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn is_empty(&self) -> bool { self.bitv.none() } /// Clears all bits in this set #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn clear(&mut self) { self.bitv.clear(); } /// Returns `true` if this set contains the specified integer. #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn contains(&self, value: &uint) -> bool { let bitv = &self.bitv; *value < bitv.nbits && bitv[*value] @@ -1669,14 +1672,14 @@ impl BitvSet { /// Returns `true` if the set has no elements in common with `other`. /// This is equivalent to checking for an empty intersection. #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn is_disjoint(&self, other: &BitvSet) -> bool { self.intersection(other).next().is_none() } /// Returns `true` if the set is a subset of another. #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn is_subset(&self, other: &BitvSet) -> bool { let self_bitv = &self.bitv; let other_bitv = &other.bitv; @@ -1690,14 +1693,14 @@ impl BitvSet { /// Returns `true` if the set is a superset of another. #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn is_superset(&self, other: &BitvSet) -> bool { other.is_subset(self) } /// Adds a value to the set. Returns `true` if the value was not already /// present in the set. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn insert(&mut self, value: uint) -> bool { if self.contains(&value) { return false; @@ -1715,7 +1718,7 @@ impl BitvSet { /// Removes a value from the set. Returns `true` if the value was /// present in the set. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn remove(&mut self, value: &uint) -> bool { if !self.contains(value) { return false; @@ -1752,7 +1755,7 @@ impl hash::Hash for BitvSet { /// An iterator for `BitvSet`. #[derive(Clone)] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct SetIter<'a> { set: &'a BitvSet, next_idx: uint @@ -1768,16 +1771,16 @@ struct TwoBitPositions<'a> { next_idx: uint } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Union<'a>(TwoBitPositions<'a>); -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Intersection<'a>(Take>); -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Difference<'a>(TwoBitPositions<'a>); -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct SymmetricDifference<'a>(TwoBitPositions<'a>); -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a> Iterator for SetIter<'a> { type Item = uint; @@ -1800,7 +1803,7 @@ impl<'a> Iterator for SetIter<'a> { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a> Iterator for TwoBitPositions<'a> { type Item = uint; @@ -1838,7 +1841,7 @@ impl<'a> Iterator for TwoBitPositions<'a> { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a> Iterator for Union<'a> { type Item = uint; @@ -1846,7 +1849,7 @@ impl<'a> Iterator for Union<'a> { #[inline] fn size_hint(&self) -> (uint, Option) { self.0.size_hint() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a> Iterator for Intersection<'a> { type Item = uint; @@ -1854,7 +1857,7 @@ impl<'a> Iterator for Intersection<'a> { #[inline] fn size_hint(&self) -> (uint, Option) { self.0.size_hint() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a> Iterator for Difference<'a> { type Item = uint; @@ -1862,7 +1865,7 @@ impl<'a> Iterator for Difference<'a> { #[inline] fn size_hint(&self) -> (uint, Option) { self.0.size_hint() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a> Iterator for SymmetricDifference<'a> { type Item = uint; diff --git a/src/libcollections/btree/map.rs b/src/libcollections/btree/map.rs index c56592177b4..8ee4a566dbc 100644 --- a/src/libcollections/btree/map.rs +++ b/src/libcollections/btree/map.rs @@ -81,7 +81,7 @@ use super::node::{self, Node, Found, GoDown}; /// done on each operation isn't *catastrophic*, and *is* still bounded by O(B logBn), /// it is certainly much slower when it does. #[derive(Clone)] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct BTreeMap { root: Node, length: uint, @@ -96,31 +96,31 @@ struct AbsIter { } /// An iterator over a BTreeMap's entries. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Iter<'a, K: 'a, V: 'a> { inner: AbsIter> } /// A mutable iterator over a BTreeMap's entries. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct IterMut<'a, K: 'a, V: 'a> { inner: AbsIter> } /// An owning iterator over a BTreeMap's entries. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct IntoIter { inner: AbsIter> } /// An iterator over a BTreeMap's keys. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Keys<'a, K: 'a, V: 'a> { inner: Map<(&'a K, &'a V), &'a K, Iter<'a, K, V>, fn((&'a K, &'a V)) -> &'a K> } /// An iterator over a BTreeMap's values. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Values<'a, K: 'a, V: 'a> { inner: Map<(&'a K, &'a V), &'a V, Iter<'a, K, V>, fn((&'a K, &'a V)) -> &'a V> } @@ -136,7 +136,8 @@ pub struct RangeMut<'a, K: 'a, V: 'a> { } /// A view into a single entry in a map, which may either be vacant or occupied. -#[unstable = "precise API still under development"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "precise API still under development")] pub enum Entry<'a, K:'a, V:'a> { /// A vacant Entry Vacant(VacantEntry<'a, K, V>), @@ -145,21 +146,23 @@ pub enum Entry<'a, K:'a, V:'a> { } /// A vacant Entry. -#[unstable = "precise API still under development"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "precise API still under development")] pub struct VacantEntry<'a, K:'a, V:'a> { key: K, stack: stack::SearchStack<'a, K, V, node::handle::Edge, node::handle::Leaf>, } /// An occupied Entry. -#[unstable = "precise API still under development"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "precise API still under development")] pub struct OccupiedEntry<'a, K:'a, V:'a> { stack: stack::SearchStack<'a, K, V, node::handle::KV, node::handle::LeafOrInternal>, } impl BTreeMap { /// Makes a new empty BTreeMap with a reasonable choice for B. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn new() -> BTreeMap { //FIXME(Gankro): Tune this as a function of size_of? BTreeMap::with_b(6) @@ -190,7 +193,7 @@ impl BTreeMap { /// a.clear(); /// assert!(a.is_empty()); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn clear(&mut self) { let b = self.b; // avoid recursive destructors by manually traversing the tree @@ -220,7 +223,7 @@ impl BTreeMap { /// assert_eq!(map.get(&1), Some(&"a")); /// assert_eq!(map.get(&2), None); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn get(&self, key: &Q) -> Option<&V> where Q: BorrowFrom + Ord { let mut cur_node = &self.root; loop { @@ -252,7 +255,7 @@ impl BTreeMap { /// assert_eq!(map.contains_key(&1), true); /// assert_eq!(map.contains_key(&2), false); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn contains_key(&self, key: &Q) -> bool where Q: BorrowFrom + Ord { self.get(key).is_some() } @@ -276,7 +279,7 @@ impl BTreeMap { /// assert_eq!(map[1], "b"); /// ``` // See `get` for implementation notes, this is basically a copy-paste with mut's added - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn get_mut(&mut self, key: &Q) -> Option<&mut V> where Q: BorrowFrom + Ord { // temp_node is a Borrowck hack for having a mutable value outlive a loop iteration let mut temp_node = &mut self.root; @@ -337,7 +340,7 @@ impl BTreeMap { /// assert_eq!(map.insert(37, "c"), Some("b")); /// assert_eq!(map[37], "c"); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn insert(&mut self, mut key: K, mut value: V) -> Option { // This is a stack of rawptrs to nodes paired with indices, respectively // representing the nodes and edges of our search path. We have to store rawptrs @@ -446,7 +449,7 @@ impl BTreeMap { /// assert_eq!(map.remove(&1), Some("a")); /// assert_eq!(map.remove(&1), None); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn remove(&mut self, key: &Q) -> Option where Q: BorrowFrom + Ord { // See `swap` for a more thorough description of the stuff going on in here let mut stack = stack::PartialSearchStack::new(self); @@ -807,7 +810,7 @@ mod stack { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl FromIterator<(K, V)> for BTreeMap { fn from_iter>(iter: T) -> BTreeMap { let mut map = BTreeMap::new(); @@ -816,7 +819,7 @@ impl FromIterator<(K, V)> for BTreeMap { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Extend<(K, V)> for BTreeMap { #[inline] fn extend>(&mut self, mut iter: T) { @@ -826,7 +829,7 @@ impl Extend<(K, V)> for BTreeMap { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl, V: Hash> Hash for BTreeMap { fn hash(&self, state: &mut S) { for elt in self.iter() { @@ -835,15 +838,15 @@ impl, V: Hash> Hash for BTreeMap { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Default for BTreeMap { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn default() -> BTreeMap { BTreeMap::new() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl PartialEq for BTreeMap { fn eq(&self, other: &BTreeMap) -> bool { self.len() == other.len() && @@ -851,10 +854,10 @@ impl PartialEq for BTreeMap { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Eq for BTreeMap {} -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl PartialOrd for BTreeMap { #[inline] fn partial_cmp(&self, other: &BTreeMap) -> Option { @@ -862,7 +865,7 @@ impl PartialOrd for BTreeMap { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Ord for BTreeMap { #[inline] fn cmp(&self, other: &BTreeMap) -> Ordering { @@ -870,7 +873,7 @@ impl Ord for BTreeMap { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Show for BTreeMap { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { try!(write!(f, "BTreeMap {{")); @@ -884,7 +887,7 @@ impl Show for BTreeMap { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Index for BTreeMap where Q: BorrowFrom + Ord { @@ -895,7 +898,7 @@ impl Index for BTreeMap } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl IndexMut for BTreeMap where Q: BorrowFrom + Ord { @@ -1006,75 +1009,75 @@ impl DoubleEndedIterator for AbsIter where } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, K, V> Iterator for Iter<'a, K, V> { type Item = (&'a K, &'a V); fn next(&mut self) -> Option<(&'a K, &'a V)> { self.inner.next() } fn size_hint(&self) -> (uint, Option) { self.inner.size_hint() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, K, V> DoubleEndedIterator for Iter<'a, K, V> { fn next_back(&mut self) -> Option<(&'a K, &'a V)> { self.inner.next_back() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, K, V> ExactSizeIterator for Iter<'a, K, V> {} -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, K, V> Iterator for IterMut<'a, K, V> { type Item = (&'a K, &'a mut V); fn next(&mut self) -> Option<(&'a K, &'a mut V)> { self.inner.next() } fn size_hint(&self) -> (uint, Option) { self.inner.size_hint() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, K, V> DoubleEndedIterator for IterMut<'a, K, V> { fn next_back(&mut self) -> Option<(&'a K, &'a mut V)> { self.inner.next_back() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, K, V> ExactSizeIterator for IterMut<'a, K, V> {} -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Iterator for IntoIter { type Item = (K, V); fn next(&mut self) -> Option<(K, V)> { self.inner.next() } fn size_hint(&self) -> (uint, Option) { self.inner.size_hint() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl DoubleEndedIterator for IntoIter { fn next_back(&mut self) -> Option<(K, V)> { self.inner.next_back() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl ExactSizeIterator for IntoIter {} -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, K, V> Iterator for Keys<'a, K, V> { type Item = &'a K; fn next(&mut self) -> Option<(&'a K)> { self.inner.next() } fn size_hint(&self) -> (uint, Option) { self.inner.size_hint() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, K, V> DoubleEndedIterator for Keys<'a, K, V> { fn next_back(&mut self) -> Option<(&'a K)> { self.inner.next_back() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, K, V> ExactSizeIterator for Keys<'a, K, V> {} -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, K, V> Iterator for Values<'a, K, V> { type Item = &'a V; fn next(&mut self) -> Option<(&'a V)> { self.inner.next() } fn size_hint(&self) -> (uint, Option) { self.inner.size_hint() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, K, V> DoubleEndedIterator for Values<'a, K, V> { fn next_back(&mut self) -> Option<(&'a V)> { self.inner.next_back() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, K, V> ExactSizeIterator for Values<'a, K, V> {} impl<'a, K, V> Iterator for Range<'a, K, V> { @@ -1096,7 +1099,8 @@ impl<'a, K, V> DoubleEndedIterator for RangeMut<'a, K, V> { } impl<'a, K: Ord, V> Entry<'a, K, V> { - #[unstable = "matches collection reform v2 specification, waiting for dust to settle"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "matches collection reform v2 specification, waiting for dust to settle")] /// Returns a mutable reference to the entry if occupied, or the VacantEntry if vacant pub fn get(self) -> Result<&'a mut V, VacantEntry<'a, K, V>> { match self { @@ -1109,7 +1113,8 @@ impl<'a, K: Ord, V> Entry<'a, K, V> { impl<'a, K: Ord, V> VacantEntry<'a, K, V> { /// Sets the value of the entry with the VacantEntry's key, /// and returns a mutable reference to it. - #[unstable = "matches collection reform v2 specification, waiting for dust to settle"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "matches collection reform v2 specification, waiting for dust to settle")] pub fn insert(self, value: V) -> &'a mut V { self.stack.insert(self.key, value) } @@ -1117,33 +1122,38 @@ impl<'a, K: Ord, V> VacantEntry<'a, K, V> { impl<'a, K: Ord, V> OccupiedEntry<'a, K, V> { /// Gets a reference to the value in the entry. - #[unstable = "matches collection reform v2 specification, waiting for dust to settle"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "matches collection reform v2 specification, waiting for dust to settle")] pub fn get(&self) -> &V { self.stack.peek() } /// Gets a mutable reference to the value in the entry. - #[unstable = "matches collection reform v2 specification, waiting for dust to settle"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "matches collection reform v2 specification, waiting for dust to settle")] pub fn get_mut(&mut self) -> &mut V { self.stack.peek_mut() } /// Converts the entry into a mutable reference to its value. - #[unstable = "matches collection reform v2 specification, waiting for dust to settle"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "matches collection reform v2 specification, waiting for dust to settle")] pub fn into_mut(self) -> &'a mut V { self.stack.into_top() } /// Sets the value of the entry with the OccupiedEntry's key, /// and returns the entry's old value. - #[unstable = "matches collection reform v2 specification, waiting for dust to settle"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "matches collection reform v2 specification, waiting for dust to settle")] pub fn insert(&mut self, mut value: V) -> V { mem::swap(self.stack.peek_mut(), &mut value); value } /// Takes the value of the entry out of the map, and returns it. - #[unstable = "matches collection reform v2 specification, waiting for dust to settle"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "matches collection reform v2 specification, waiting for dust to settle")] pub fn remove(self) -> V { self.stack.remove() } @@ -1169,7 +1179,7 @@ impl BTreeMap { /// let (first_key, first_value) = map.iter().next().unwrap(); /// assert_eq!((*first_key, *first_value), (1u, "a")); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn iter(&self) -> Iter { let len = self.len(); // NB. The initial capacity for ringbuf is large enough to avoid reallocs in many cases. @@ -1202,7 +1212,7 @@ impl BTreeMap { /// } /// } /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn iter_mut(&mut self) -> IterMut { let len = self.len(); let mut lca = RingBuf::new(); @@ -1231,7 +1241,7 @@ impl BTreeMap { /// println!("{}: {}", key, value); /// } /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn into_iter(self) -> IntoIter { let len = self.len(); let mut lca = RingBuf::new(); @@ -1258,7 +1268,7 @@ impl BTreeMap { /// let keys: Vec = a.keys().cloned().collect(); /// assert_eq!(keys, vec![1u,2,]); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn keys<'a>(&'a self) -> Keys<'a, K, V> { fn first((a, _): (A, B)) -> A { a } let first: fn((&'a K, &'a V)) -> &'a K = first; // coerce to fn pointer @@ -1280,7 +1290,7 @@ impl BTreeMap { /// let values: Vec<&str> = a.values().cloned().collect(); /// assert_eq!(values, vec!["a","b"]); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn values<'a>(&'a self) -> Values<'a, K, V> { fn second((_, b): (A, B)) -> B { b } let second: fn((&'a K, &'a V)) -> &'a V = second; // coerce to fn pointer @@ -1300,7 +1310,7 @@ impl BTreeMap { /// a.insert(1u, "a"); /// assert_eq!(a.len(), 1); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn len(&self) -> uint { self.length } /// Return true if the map contains no elements. @@ -1315,7 +1325,7 @@ impl BTreeMap { /// a.insert(1u, "a"); /// assert!(!a.is_empty()); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn is_empty(&self) -> bool { self.len() == 0 } } @@ -1470,7 +1480,8 @@ impl BTreeMap { /// } /// assert_eq!(Some((&5u, &"b")), map.range(Included(&4), Unbounded).next()); /// ``` - #[unstable = "matches collection reform specification, waiting for dust to settle"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "matches collection reform specification, waiting for dust to settle")] pub fn range<'a>(&'a self, min: Bound<&K>, max: Bound<&K>) -> Range<'a, K, V> { range_impl!(&self.root, min, max, as_slices_internal, iter, Range, edges, []) } @@ -1496,7 +1507,8 @@ impl BTreeMap { /// println!("{} => {}", name, balance); /// } /// ``` - #[unstable = "matches collection reform specification, waiting for dust to settle"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "matches collection reform specification, waiting for dust to settle")] pub fn range_mut<'a>(&'a mut self, min: Bound<&K>, max: Bound<&K>) -> RangeMut<'a, K, V> { range_impl!(&mut self.root, min, max, as_slices_internal_mut, iter_mut, RangeMut, edges_mut, [mut]) @@ -1528,7 +1540,8 @@ impl BTreeMap { /// assert_eq!(count["a"], 3u); /// ``` /// The key must have the same ordering before or after `.to_owned()` is called. - #[unstable = "precise API still under development"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "precise API still under development")] pub fn entry<'a>(&'a mut self, mut key: K) -> Entry<'a, K, V> { // same basic logic of `swap` and `pop`, blended together let mut stack = stack::PartialSearchStack::new(self); diff --git a/src/libcollections/btree/node.rs b/src/libcollections/btree/node.rs index fa890643089..2ae8dfa4931 100644 --- a/src/libcollections/btree/node.rs +++ b/src/libcollections/btree/node.rs @@ -420,7 +420,7 @@ impl Node { } // FIXME(gereeter) Write an efficient clone_from -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Clone for Node { fn clone(&self) -> Node { let mut ret = if self.is_leaf() { diff --git a/src/libcollections/btree/set.rs b/src/libcollections/btree/set.rs index 4d71f9dbea8..00d90aefab7 100644 --- a/src/libcollections/btree/set.rs +++ b/src/libcollections/btree/set.rs @@ -34,19 +34,19 @@ use Bound; /// See BTreeMap's documentation for a detailed discussion of this collection's performance /// benefits and drawbacks. #[derive(Clone, Hash, PartialEq, Eq, Ord, PartialOrd)] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct BTreeSet{ map: BTreeMap, } /// An iterator over a BTreeSet's items. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Iter<'a, T: 'a> { iter: Keys<'a, T, ()> } /// An owning iterator over a BTreeSet's items. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct IntoIter { iter: Map<(T, ()), T, ::btree_map::IntoIter, fn((T, ())) -> T> } @@ -57,28 +57,28 @@ pub struct Range<'a, T: 'a> { } /// A lazy iterator producing elements in the set difference (in-order). -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Difference<'a, T:'a> { a: Peekable<&'a T, Iter<'a, T>>, b: Peekable<&'a T, Iter<'a, T>>, } /// A lazy iterator producing elements in the set symmetric difference (in-order). -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct SymmetricDifference<'a, T:'a> { a: Peekable<&'a T, Iter<'a, T>>, b: Peekable<&'a T, Iter<'a, T>>, } /// A lazy iterator producing elements in the set intersection (in-order). -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Intersection<'a, T:'a> { a: Peekable<&'a T, Iter<'a, T>>, b: Peekable<&'a T, Iter<'a, T>>, } /// A lazy iterator producing elements in the set union (in-order). -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Union<'a, T:'a> { a: Peekable<&'a T, Iter<'a, T>>, b: Peekable<&'a T, Iter<'a, T>>, @@ -94,7 +94,7 @@ impl BTreeSet { /// /// let mut set: BTreeSet = BTreeSet::new(); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn new() -> BTreeSet { BTreeSet { map: BTreeMap::new() } } @@ -102,7 +102,8 @@ impl BTreeSet { /// Makes a new BTreeSet with the given B. /// /// B cannot be less than 2. - #[unstable = "probably want this to be on the type, eventually"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "probably want this to be on the type, eventually")] pub fn with_b(b: uint) -> BTreeSet { BTreeSet { map: BTreeMap::with_b(b) } } @@ -125,7 +126,7 @@ impl BTreeSet { /// let v: Vec = set.iter().map(|&x| x).collect(); /// assert_eq!(v, vec![1u,2,3,4]); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn iter(&self) -> Iter { Iter { iter: self.map.keys() } } @@ -142,7 +143,7 @@ impl BTreeSet { /// let v: Vec = set.into_iter().collect(); /// assert_eq!(v, vec![1u,2,3,4]); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn into_iter(self) -> IntoIter { fn first((a, _): (A, B)) -> A { a } let first: fn((T, ())) -> T = first; // coerce to fn pointer @@ -172,7 +173,8 @@ impl BTreeSet { /// } /// assert_eq!(Some(&5u), set.range(Included(&4), Unbounded).next()); /// ``` - #[unstable = "matches collection reform specification, waiting for dust to settle"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "matches collection reform specification, waiting for dust to settle")] pub fn range<'a>(&'a self, min: Bound<&T>, max: Bound<&T>) -> Range<'a, T> { fn first((a, _): (A, B)) -> A { a } let first: fn((&'a T, &'a ())) -> &'a T = first; // coerce to fn pointer @@ -200,7 +202,7 @@ impl BTreeSet { /// let diff: Vec = a.difference(&b).cloned().collect(); /// assert_eq!(diff, vec![1u]); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn difference<'a>(&'a self, other: &'a BTreeSet) -> Difference<'a, T> { Difference{a: self.iter().peekable(), b: other.iter().peekable()} } @@ -223,7 +225,7 @@ impl BTreeSet { /// let sym_diff: Vec = a.symmetric_difference(&b).cloned().collect(); /// assert_eq!(sym_diff, vec![1u,3]); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn symmetric_difference<'a>(&'a self, other: &'a BTreeSet) -> SymmetricDifference<'a, T> { SymmetricDifference{a: self.iter().peekable(), b: other.iter().peekable()} @@ -247,7 +249,7 @@ impl BTreeSet { /// let intersection: Vec = a.intersection(&b).cloned().collect(); /// assert_eq!(intersection, vec![2u]); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn intersection<'a>(&'a self, other: &'a BTreeSet) -> Intersection<'a, T> { Intersection{a: self.iter().peekable(), b: other.iter().peekable()} @@ -269,7 +271,7 @@ impl BTreeSet { /// let union: Vec = a.union(&b).cloned().collect(); /// assert_eq!(union, vec![1u,2]); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn union<'a>(&'a self, other: &'a BTreeSet) -> Union<'a, T> { Union{a: self.iter().peekable(), b: other.iter().peekable()} } @@ -286,7 +288,7 @@ impl BTreeSet { /// v.insert(1i); /// assert_eq!(v.len(), 1); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn len(&self) -> uint { self.map.len() } /// Returns true if the set contains no elements @@ -301,7 +303,7 @@ impl BTreeSet { /// v.insert(1i); /// assert!(!v.is_empty()); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn is_empty(&self) -> bool { self.len() == 0 } /// Clears the set, removing all values. @@ -316,7 +318,7 @@ impl BTreeSet { /// v.clear(); /// assert!(v.is_empty()); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn clear(&mut self) { self.map.clear() } @@ -336,7 +338,7 @@ impl BTreeSet { /// assert_eq!(set.contains(&1), true); /// assert_eq!(set.contains(&4), false); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn contains(&self, value: &Q) -> bool where Q: BorrowFrom + Ord { self.map.contains_key(value) } @@ -358,7 +360,7 @@ impl BTreeSet { /// b.insert(1); /// assert_eq!(a.is_disjoint(&b), false); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn is_disjoint(&self, other: &BTreeSet) -> bool { self.intersection(other).next().is_none() } @@ -379,7 +381,7 @@ impl BTreeSet { /// set.insert(4); /// assert_eq!(set.is_subset(&sup), false); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn is_subset(&self, other: &BTreeSet) -> bool { // Stolen from TreeMap let mut x = self.iter(); @@ -424,7 +426,7 @@ impl BTreeSet { /// set.insert(2); /// assert_eq!(set.is_superset(&sub), true); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn is_superset(&self, other: &BTreeSet) -> bool { other.is_subset(self) } @@ -443,7 +445,7 @@ impl BTreeSet { /// assert_eq!(set.insert(2i), false); /// assert_eq!(set.len(), 1); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn insert(&mut self, value: T) -> bool { self.map.insert(value, ()).is_none() } @@ -466,13 +468,13 @@ impl BTreeSet { /// assert_eq!(set.remove(&2), true); /// assert_eq!(set.remove(&2), false); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn remove(&mut self, value: &Q) -> bool where Q: BorrowFrom + Ord { self.map.remove(value).is_some() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl FromIterator for BTreeSet { fn from_iter>(iter: Iter) -> BTreeSet { let mut set = BTreeSet::new(); @@ -481,7 +483,7 @@ impl FromIterator for BTreeSet { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Extend for BTreeSet { #[inline] fn extend>(&mut self, mut iter: Iter) { @@ -491,15 +493,15 @@ impl Extend for BTreeSet { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Default for BTreeSet { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn default() -> BTreeSet { BTreeSet::new() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, 'b, T: Ord + Clone> Sub<&'b BTreeSet> for &'a BTreeSet { type Output = BTreeSet; @@ -522,7 +524,7 @@ impl<'a, 'b, T: Ord + Clone> Sub<&'b BTreeSet> for &'a BTreeSet { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, 'b, T: Ord + Clone> BitXor<&'b BTreeSet> for &'a BTreeSet { type Output = BTreeSet; @@ -545,7 +547,7 @@ impl<'a, 'b, T: Ord + Clone> BitXor<&'b BTreeSet> for &'a BTreeSet { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, 'b, T: Ord + Clone> BitAnd<&'b BTreeSet> for &'a BTreeSet { type Output = BTreeSet; @@ -568,7 +570,7 @@ impl<'a, 'b, T: Ord + Clone> BitAnd<&'b BTreeSet> for &'a BTreeSet { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, 'b, T: Ord + Clone> BitOr<&'b BTreeSet> for &'a BTreeSet { type Output = BTreeSet; @@ -591,7 +593,7 @@ impl<'a, 'b, T: Ord + Clone> BitOr<&'b BTreeSet> for &'a BTreeSet { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Show for BTreeSet { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { try!(write!(f, "BTreeSet {{")); @@ -605,33 +607,33 @@ impl Show for BTreeSet { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T> Iterator for Iter<'a, T> { type Item = &'a T; fn next(&mut self) -> Option<&'a T> { self.iter.next() } fn size_hint(&self) -> (uint, Option) { self.iter.size_hint() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T> DoubleEndedIterator for Iter<'a, T> { fn next_back(&mut self) -> Option<&'a T> { self.iter.next_back() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T> ExactSizeIterator for Iter<'a, T> {} -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Iterator for IntoIter { type Item = T; fn next(&mut self) -> Option { self.iter.next() } fn size_hint(&self) -> (uint, Option) { self.iter.size_hint() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl DoubleEndedIterator for IntoIter { fn next_back(&mut self) -> Option { self.iter.next_back() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl ExactSizeIterator for IntoIter {} @@ -654,7 +656,7 @@ fn cmp_opt(x: Option<&T>, y: Option<&T>, } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T: Ord> Iterator for Difference<'a, T> { type Item = &'a T; @@ -669,7 +671,7 @@ impl<'a, T: Ord> Iterator for Difference<'a, T> { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T: Ord> Iterator for SymmetricDifference<'a, T> { type Item = &'a T; @@ -684,7 +686,7 @@ impl<'a, T: Ord> Iterator for SymmetricDifference<'a, T> { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T: Ord> Iterator for Intersection<'a, T> { type Item = &'a T; @@ -705,7 +707,7 @@ impl<'a, T: Ord> Iterator for Intersection<'a, T> { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T: Ord> Iterator for Union<'a, T> { type Item = &'a T; diff --git a/src/libcollections/dlist.rs b/src/libcollections/dlist.rs index cce8cf398e1..f0f2ef3488c 100644 --- a/src/libcollections/dlist.rs +++ b/src/libcollections/dlist.rs @@ -19,7 +19,7 @@ // Backlinks over DList::prev are raw pointers that form a full chain in // the reverse direction. -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] use core::prelude::*; @@ -33,7 +33,7 @@ use core::mem; use core::ptr; /// A doubly-linked list. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct DList { length: uint, list_head: Link, @@ -57,7 +57,7 @@ struct Node { } /// An iterator over references to the items of a `DList`. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Iter<'a, T:'a> { head: &'a Link, tail: Rawlink>, @@ -65,7 +65,7 @@ pub struct Iter<'a, T:'a> { } // FIXME #19839: deriving is too aggressive on the bounds (T doesn't need to be Clone). -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T> Clone for Iter<'a, T> { fn clone(&self) -> Iter<'a, T> { Iter { @@ -77,7 +77,7 @@ impl<'a, T> Clone for Iter<'a, T> { } /// An iterator over mutable references to the items of a `DList`. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct IterMut<'a, T:'a> { list: &'a mut DList, head: Rawlink>, @@ -87,7 +87,7 @@ pub struct IterMut<'a, T:'a> { /// An iterator over mutable references to the items of a `DList`. #[derive(Clone)] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct IntoIter { list: DList } @@ -206,17 +206,17 @@ impl DList { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Default for DList { #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn default() -> DList { DList::new() } } impl DList { /// Creates an empty `DList`. #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn new() -> DList { DList{list_head: None, list_tail: Rawlink::none(), length: 0} } @@ -273,14 +273,14 @@ impl DList { /// Provides a forward iterator. #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn iter(&self) -> Iter { Iter{nelem: self.len(), head: &self.list_head, tail: self.list_tail} } /// Provides a forward iterator with mutable references. #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn iter_mut(&mut self) -> IterMut { let head_raw = match self.list_head { Some(ref mut h) => Rawlink::some(&mut **h), @@ -296,7 +296,7 @@ impl DList { /// Consumes the list into an iterator yielding elements by value. #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn into_iter(self) -> IntoIter { IntoIter{list: self} } @@ -317,7 +317,7 @@ impl DList { /// assert!(!dl.is_empty()); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn is_empty(&self) -> bool { self.list_head.is_none() } @@ -344,7 +344,7 @@ impl DList { /// /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn len(&self) -> uint { self.length } @@ -371,7 +371,7 @@ impl DList { /// /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn clear(&mut self) { *self = DList::new() } @@ -392,7 +392,7 @@ impl DList { /// /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn front(&self) -> Option<&T> { self.list_head.as_ref().map(|head| &head.value) } @@ -419,7 +419,7 @@ impl DList { /// /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn front_mut(&mut self) -> Option<&mut T> { self.list_head.as_mut().map(|head| &mut head.value) } @@ -440,7 +440,7 @@ impl DList { /// /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn back(&self) -> Option<&T> { self.list_tail.resolve_immut().as_ref().map(|tail| &tail.value) } @@ -467,7 +467,7 @@ impl DList { /// /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn back_mut(&mut self) -> Option<&mut T> { self.list_tail.resolve().map(|tail| &mut tail.value) } @@ -490,7 +490,7 @@ impl DList { /// assert_eq!(dl.front().unwrap(), &1); /// /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn push_front(&mut self, elt: T) { self.push_front_node(box Node::new(elt)) } @@ -516,7 +516,7 @@ impl DList { /// /// ``` /// - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn pop_front(&mut self) -> Option { self.pop_front_node().map(|box Node{value, ..}| value) } @@ -533,7 +533,7 @@ impl DList { /// d.push_back(3); /// assert_eq!(3, *d.back().unwrap()); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn push_back(&mut self, elt: T) { self.push_back_node(box Node::new(elt)) } @@ -552,7 +552,7 @@ impl DList { /// d.push_back(3); /// assert_eq!(d.pop_back(), Some(3)); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn pop_back(&mut self) -> Option { self.pop_back_node().map(|box Node{value, ..}| value) } @@ -577,7 +577,7 @@ impl DList { /// assert_eq!(splitted.pop_front(), Some(1)); /// assert_eq!(splitted.pop_front(), None); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn split_off(&mut self, at: uint) -> DList { let len = self.len(); assert!(at < len, "Cannot split off at a nonexistent index"); @@ -620,7 +620,7 @@ impl DList { } #[unsafe_destructor] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Drop for DList { fn drop(&mut self) { // Dissolve the dlist in backwards direction @@ -642,7 +642,7 @@ impl Drop for DList { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, A> Iterator for Iter<'a, A> { type Item = &'a A; @@ -664,7 +664,7 @@ impl<'a, A> Iterator for Iter<'a, A> { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, A> DoubleEndedIterator for Iter<'a, A> { #[inline] fn next_back(&mut self) -> Option<&'a A> { @@ -679,10 +679,10 @@ impl<'a, A> DoubleEndedIterator for Iter<'a, A> { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, A> ExactSizeIterator for Iter<'a, A> {} -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, A> Iterator for IterMut<'a, A> { type Item = &'a mut A; #[inline] @@ -706,7 +706,7 @@ impl<'a, A> Iterator for IterMut<'a, A> { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, A> DoubleEndedIterator for IterMut<'a, A> { #[inline] fn next_back(&mut self) -> Option<&'a mut A> { @@ -721,7 +721,7 @@ impl<'a, A> DoubleEndedIterator for IterMut<'a, A> { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, A> ExactSizeIterator for IterMut<'a, A> {} // private methods for IterMut @@ -770,7 +770,8 @@ impl<'a, A> IterMut<'a, A> { /// } /// ``` #[inline] - #[unstable = "this is probably better handled by a cursor type -- we'll see"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "this is probably better handled by a cursor type -- we'll see")] pub fn insert_next(&mut self, elt: A) { self.insert_next_node(box Node::new(elt)) } @@ -791,7 +792,8 @@ impl<'a, A> IterMut<'a, A> { /// assert_eq!(it.next().unwrap(), &2); /// ``` #[inline] - #[unstable = "this is probably better handled by a cursor type -- we'll see"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "this is probably better handled by a cursor type -- we'll see")] pub fn peek_next(&mut self) -> Option<&mut A> { if self.nelem == 0 { return None @@ -800,7 +802,7 @@ impl<'a, A> IterMut<'a, A> { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Iterator for IntoIter { type Item = A; @@ -813,13 +815,13 @@ impl Iterator for IntoIter { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl DoubleEndedIterator for IntoIter { #[inline] fn next_back(&mut self) -> Option { self.list.pop_back() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl FromIterator for DList { fn from_iter>(iterator: T) -> DList { let mut ret = DList::new(); @@ -828,14 +830,14 @@ impl FromIterator for DList { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Extend for DList { fn extend>(&mut self, mut iterator: T) { for elt in iterator { self.push_back(elt); } } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl PartialEq for DList { fn eq(&self, other: &DList) -> bool { self.len() == other.len() && @@ -848,17 +850,17 @@ impl PartialEq for DList { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Eq for DList {} -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl PartialOrd for DList { fn partial_cmp(&self, other: &DList) -> Option { iter::order::partial_cmp(self.iter(), other.iter()) } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Ord for DList { #[inline] fn cmp(&self, other: &DList) -> Ordering { @@ -866,14 +868,14 @@ impl Ord for DList { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Clone for DList { fn clone(&self) -> DList { self.iter().map(|x| x.clone()).collect() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl fmt::Show for DList { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { try!(write!(f, "DList [")); @@ -887,7 +889,7 @@ impl fmt::Show for DList { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl> Hash for DList { fn hash(&self, state: &mut S) { self.len().hash(state); diff --git a/src/libcollections/enum_set.rs b/src/libcollections/enum_set.rs index 1b852d0ba68..ec5d7cbcda9 100644 --- a/src/libcollections/enum_set.rs +++ b/src/libcollections/enum_set.rs @@ -82,19 +82,22 @@ fn bit(e: &E) -> uint { impl EnumSet { /// Returns an empty `EnumSet`. - #[unstable = "matches collection reform specification, waiting for dust to settle"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "matches collection reform specification, waiting for dust to settle")] pub fn new() -> EnumSet { EnumSet {bits: 0} } /// Returns the number of elements in the given `EnumSet`. - #[unstable = "matches collection reform specification, waiting for dust to settle"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "matches collection reform specification, waiting for dust to settle")] pub fn len(&self) -> uint { self.bits.count_ones() } /// Returns true if the `EnumSet` is empty. - #[unstable = "matches collection reform specification, waiting for dust to settle"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "matches collection reform specification, waiting for dust to settle")] pub fn is_empty(&self) -> bool { self.bits == 0 } @@ -104,19 +107,22 @@ impl EnumSet { } /// Returns `false` if the `EnumSet` contains any enum of the given `EnumSet`. - #[unstable = "matches collection reform specification, waiting for dust to settle"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "matches collection reform specification, waiting for dust to settle")] pub fn is_disjoint(&self, other: &EnumSet) -> bool { (self.bits & other.bits) == 0 } /// Returns `true` if a given `EnumSet` is included in this `EnumSet`. - #[unstable = "matches collection reform specification, waiting for dust to settle"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "matches collection reform specification, waiting for dust to settle")] pub fn is_superset(&self, other: &EnumSet) -> bool { (self.bits & other.bits) == other.bits } /// Returns `true` if this `EnumSet` is included in the given `EnumSet`. - #[unstable = "matches collection reform specification, waiting for dust to settle"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "matches collection reform specification, waiting for dust to settle")] pub fn is_subset(&self, other: &EnumSet) -> bool { other.is_superset(self) } @@ -132,7 +138,8 @@ impl EnumSet { } /// Adds an enum to the `EnumSet`, and returns `true` if it wasn't there before - #[unstable = "matches collection reform specification, waiting for dust to settle"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "matches collection reform specification, waiting for dust to settle")] pub fn insert(&mut self, e: E) -> bool { let result = !self.contains(&e); self.bits |= bit(&e); @@ -140,7 +147,8 @@ impl EnumSet { } /// Removes an enum from the EnumSet - #[unstable = "matches collection reform specification, waiting for dust to settle"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "matches collection reform specification, waiting for dust to settle")] pub fn remove(&mut self, e: &E) -> bool { let result = self.contains(e); self.bits &= !bit(e); @@ -148,13 +156,15 @@ impl EnumSet { } /// Returns `true` if an `EnumSet` contains a given enum. - #[unstable = "matches collection reform specification, waiting for dust to settle"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "matches collection reform specification, waiting for dust to settle")] pub fn contains(&self, e: &E) -> bool { (self.bits & bit(e)) != 0 } /// Returns an iterator over an `EnumSet`. - #[unstable = "matches collection reform specification, waiting for dust to settle"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "matches collection reform specification, waiting for dust to settle")] pub fn iter(&self) -> Iter { Iter::new(self.bits) } diff --git a/src/libcollections/lib.rs b/src/libcollections/lib.rs index 6a182add000..9663adfb39d 100644 --- a/src/libcollections/lib.rs +++ b/src/libcollections/lib.rs @@ -14,7 +14,7 @@ #![crate_name = "collections"] -#![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", @@ -70,23 +70,25 @@ pub mod string; pub mod vec; pub mod vec_map; -#[unstable = "RFC 509"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "RFC 509")] pub mod bitv { pub use bit::{Bitv, Iter}; } -#[unstable = "RFC 509"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "RFC 509")] pub mod bitv_set { pub use bit::{BitvSet, Union, Intersection, Difference, SymmetricDifference}; pub use bit::SetIter as Iter; } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub mod btree_map { pub use btree::map::*; } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub mod btree_set { pub use btree::set::*; } diff --git a/src/libcollections/macros.rs b/src/libcollections/macros.rs index c078db7d46f..317a56b818c 100644 --- a/src/libcollections/macros.rs +++ b/src/libcollections/macros.rs @@ -10,7 +10,7 @@ /// Creates a `Vec` containing the arguments. #[macro_export] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] macro_rules! vec { ($x:expr; $y:expr) => ({ let xs: $crate::boxed::Box<[_]> = $crate::boxed::Box::new([$x; $y]); diff --git a/src/libcollections/ring_buf.rs b/src/libcollections/ring_buf.rs index b9cb4be7c18..156ba129bcb 100644 --- a/src/libcollections/ring_buf.rs +++ b/src/libcollections/ring_buf.rs @@ -12,7 +12,7 @@ //! ends of the container. It also has `O(1)` indexing like a vector. The contained elements are //! not required to be copyable, and the queue will be sendable if the contained type is sendable. -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] use core::prelude::*; @@ -36,7 +36,7 @@ static INITIAL_CAPACITY: uint = 7u; // 2^3 - 1 static MINIMUM_CAPACITY: uint = 1u; // 2 - 1 /// `RingBuf` is a circular buffer, which can be used as a double-ended queue efficiently. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct RingBuf { // tail and head are pointers into the buffer. Tail always points // to the first element that could be read, Head always points @@ -50,13 +50,13 @@ pub struct RingBuf { ptr: *mut T } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] unsafe impl Send for RingBuf {} -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] unsafe impl Sync for RingBuf {} -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Clone for RingBuf { fn clone(&self) -> RingBuf { self.iter().map(|t| t.clone()).collect() @@ -64,7 +64,7 @@ impl Clone for RingBuf { } #[unsafe_destructor] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Drop for RingBuf { fn drop(&mut self) { self.clear(); @@ -78,7 +78,7 @@ impl Drop for RingBuf { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Default for RingBuf { #[inline] fn default() -> RingBuf { RingBuf::new() } @@ -146,13 +146,13 @@ impl RingBuf { impl RingBuf { /// Creates an empty `RingBuf`. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn new() -> RingBuf { RingBuf::with_capacity(INITIAL_CAPACITY) } /// Creates an empty `RingBuf` with space for at least `n` elements. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn with_capacity(n: uint) -> RingBuf { // +1 since the ringbuffer always leaves one space empty let cap = cmp::max(n + 1, MINIMUM_CAPACITY + 1).next_power_of_two(); @@ -191,7 +191,7 @@ impl RingBuf { /// buf.push_back(5); /// assert_eq!(buf.get(1).unwrap(), &4); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn get(&self, i: uint) -> Option<&T> { if i < self.len() { let idx = self.wrap_index(self.tail + i); @@ -221,7 +221,7 @@ impl RingBuf { /// /// assert_eq!(buf[1], 7); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn get_mut(&mut self, i: uint) -> Option<&mut T> { if i < self.len() { let idx = self.wrap_index(self.tail + i); @@ -250,7 +250,7 @@ impl RingBuf { /// assert_eq!(buf[0], 5); /// assert_eq!(buf[2], 3); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn swap(&mut self, i: uint, j: uint) { assert!(i < self.len()); assert!(j < self.len()); @@ -273,7 +273,7 @@ impl RingBuf { /// assert!(buf.capacity() >= 10); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn capacity(&self) -> uint { self.cap - 1 } /// Reserves the minimum capacity for exactly `additional` more elements to be inserted in the @@ -296,7 +296,7 @@ impl RingBuf { /// buf.reserve_exact(10); /// assert!(buf.capacity() >= 11); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn reserve_exact(&mut self, additional: uint) { self.reserve(additional); } @@ -317,7 +317,7 @@ impl RingBuf { /// buf.reserve(10); /// assert!(buf.capacity() >= 11); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn reserve(&mut self, additional: uint) { let new_len = self.len() + additional; assert!(new_len + 1 > self.len(), "capacity overflow"); @@ -480,7 +480,8 @@ impl RingBuf { /// assert_eq!(buf.len(), 1); /// assert_eq!(Some(&5), buf.get(0)); /// ``` - #[unstable = "matches collection reform specification; waiting on panic semantics"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "matches collection reform specification; waiting on panic semantics")] pub fn truncate(&mut self, len: uint) { for _ in range(len, self.len()) { self.pop_back(); @@ -501,7 +502,7 @@ impl RingBuf { /// let b: &[_] = &[&5, &3, &4]; /// assert_eq!(buf.iter().collect::>().as_slice(), b); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn iter(&self) -> Iter { Iter { tail: self.tail, @@ -527,7 +528,7 @@ impl RingBuf { /// let b: &[_] = &[&mut 3, &mut 1, &mut 2]; /// assert_eq!(&buf.iter_mut().collect::>()[], b); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn iter_mut<'a>(&'a mut self) -> IterMut<'a, T> { IterMut { tail: self.tail, @@ -539,7 +540,7 @@ impl RingBuf { } /// Consumes the list into an iterator yielding elements by value. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn into_iter(self) -> IntoIter { IntoIter { inner: self, @@ -549,7 +550,8 @@ impl RingBuf { /// Returns a pair of slices which contain, in order, the contents of the /// `RingBuf`. #[inline] - #[unstable = "matches collection reform specification, waiting for dust to settle"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "matches collection reform specification, waiting for dust to settle")] pub fn as_slices<'a>(&'a self) -> (&'a [T], &'a [T]) { unsafe { let contiguous = self.is_contiguous(); @@ -568,7 +570,8 @@ impl RingBuf { /// Returns a pair of slices which contain, in order, the contents of the /// `RingBuf`. #[inline] - #[unstable = "matches collection reform specification, waiting for dust to settle"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "matches collection reform specification, waiting for dust to settle")] pub fn as_mut_slices<'a>(&'a mut self) -> (&'a mut [T], &'a mut [T]) { unsafe { let contiguous = self.is_contiguous(); @@ -600,7 +603,7 @@ impl RingBuf { /// v.push_back(1i); /// assert_eq!(v.len(), 1); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn len(&self) -> uint { count(self.tail, self.head, self.cap) } /// Returns true if the buffer contains no elements @@ -615,7 +618,7 @@ impl RingBuf { /// v.push_front(1i); /// assert!(!v.is_empty()); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn is_empty(&self) -> bool { self.len() == 0 } /// Creates a draining iterator that clears the `RingBuf` and iterates over @@ -632,7 +635,8 @@ impl RingBuf { /// assert!(v.is_empty()); /// ``` #[inline] - #[unstable = "matches collection reform specification, waiting for dust to settle"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "matches collection reform specification, waiting for dust to settle")] pub fn drain(&mut self) -> Drain { Drain { inner: self, @@ -651,7 +655,7 @@ impl RingBuf { /// v.clear(); /// assert!(v.is_empty()); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] #[inline] pub fn clear(&mut self) { self.drain(); @@ -672,7 +676,7 @@ impl RingBuf { /// d.push_back(2i); /// assert_eq!(d.front(), Some(&1i)); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn front(&self) -> Option<&T> { if !self.is_empty() { Some(&self[0]) } else { None } } @@ -696,7 +700,7 @@ impl RingBuf { /// } /// assert_eq!(d.front(), Some(&9i)); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn front_mut(&mut self) -> Option<&mut T> { if !self.is_empty() { Some(&mut self[0]) } else { None } } @@ -716,7 +720,7 @@ impl RingBuf { /// d.push_back(2i); /// assert_eq!(d.back(), Some(&2i)); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn back(&self) -> Option<&T> { if !self.is_empty() { Some(&self[self.len() - 1]) } else { None } } @@ -740,7 +744,7 @@ impl RingBuf { /// } /// assert_eq!(d.back(), Some(&9i)); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn back_mut(&mut self) -> Option<&mut T> { let len = self.len(); if !self.is_empty() { Some(&mut self[len - 1]) } else { None } @@ -762,7 +766,7 @@ impl RingBuf { /// assert_eq!(d.pop_front(), Some(2i)); /// assert_eq!(d.pop_front(), None); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn pop_front(&mut self) -> Option { if self.is_empty() { None @@ -785,7 +789,7 @@ impl RingBuf { /// d.push_front(2i); /// assert_eq!(d.front(), Some(&2i)); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn push_front(&mut self, t: T) { if self.is_full() { self.reserve(1); @@ -809,7 +813,7 @@ impl RingBuf { /// buf.push_back(3); /// assert_eq!(3, *buf.back().unwrap()); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn push_back(&mut self, t: T) { if self.is_full() { self.reserve(1); @@ -835,7 +839,7 @@ impl RingBuf { /// buf.push_back(3); /// assert_eq!(buf.pop_back(), Some(3)); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn pop_back(&mut self) -> Option { if self.is_empty() { None @@ -872,7 +876,8 @@ impl RingBuf { /// buf.push_back(10); /// assert_eq!(buf.swap_back_remove(1), Some(99)); /// ``` - #[unstable = "the naming of this function may be altered"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "the naming of this function may be altered")] pub fn swap_back_remove(&mut self, index: uint) -> Option { let length = self.len(); if length > 0 && index < length - 1 { @@ -904,7 +909,8 @@ impl RingBuf { /// buf.push_back(20i); /// assert_eq!(buf.swap_front_remove(3), Some(99)); /// ``` - #[unstable = "the naming of this function may be altered"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "the naming of this function may be altered")] pub fn swap_front_remove(&mut self, index: uint) -> Option { let length = self.len(); if length > 0 && index < length && index != 0 { @@ -1137,7 +1143,7 @@ impl RingBuf { /// buf.remove(2); /// assert_eq!(Some(&15), buf.get(2)); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn remove(&mut self, i: uint) -> Option { if self.is_empty() || self.len() <= i { return None; @@ -1304,7 +1310,8 @@ impl RingBuf { /// assert_eq!(a, b); /// } /// ``` - #[unstable = "matches collection reform specification; waiting on panic semantics"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "matches collection reform specification; waiting on panic semantics")] pub fn resize(&mut self, new_len: uint, value: T) { let len = self.len(); @@ -1331,7 +1338,7 @@ fn count(tail: uint, head: uint, size: uint) -> uint { } /// `RingBuf` iterator. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Iter<'a, T:'a> { ring: &'a [T], tail: uint, @@ -1349,7 +1356,7 @@ impl<'a, T> Clone for Iter<'a, T> { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T> Iterator for Iter<'a, T> { type Item = &'a T; @@ -1370,7 +1377,7 @@ impl<'a, T> Iterator for Iter<'a, T> { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T> DoubleEndedIterator for Iter<'a, T> { #[inline] fn next_back(&mut self) -> Option<&'a T> { @@ -1382,10 +1389,10 @@ impl<'a, T> DoubleEndedIterator for Iter<'a, T> { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T> ExactSizeIterator for Iter<'a, T> {} -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T> RandomAccessIterator for Iter<'a, T> { #[inline] fn indexable(&self) -> uint { @@ -1408,7 +1415,7 @@ impl<'a, T> RandomAccessIterator for Iter<'a, T> { // with returning the mutable reference. I couldn't find a way to // make the lifetime checker happy so, but there should be a way. /// `RingBuf` mutable iterator. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct IterMut<'a, T:'a> { ptr: *mut T, tail: uint, @@ -1417,7 +1424,7 @@ pub struct IterMut<'a, T:'a> { marker: marker::ContravariantLifetime<'a>, } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T> Iterator for IterMut<'a, T> { type Item = &'a mut T; @@ -1441,7 +1448,7 @@ impl<'a, T> Iterator for IterMut<'a, T> { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T> DoubleEndedIterator for IterMut<'a, T> { #[inline] fn next_back(&mut self) -> Option<&'a mut T> { @@ -1456,16 +1463,16 @@ impl<'a, T> DoubleEndedIterator for IterMut<'a, T> { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T> ExactSizeIterator for IterMut<'a, T> {} /// A by-value RingBuf iterator -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct IntoIter { inner: RingBuf, } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Iterator for IntoIter { type Item = T; @@ -1481,7 +1488,7 @@ impl Iterator for IntoIter { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl DoubleEndedIterator for IntoIter { #[inline] fn next_back(&mut self) -> Option { @@ -1489,17 +1496,18 @@ impl DoubleEndedIterator for IntoIter { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl ExactSizeIterator for IntoIter {} /// A draining RingBuf iterator -#[unstable = "matches collection reform specification, waiting for dust to settle"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "matches collection reform specification, waiting for dust to settle")] pub struct Drain<'a, T: 'a> { inner: &'a mut RingBuf, } #[unsafe_destructor] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T: 'a> Drop for Drain<'a, T> { fn drop(&mut self) { for _ in *self {} @@ -1508,7 +1516,7 @@ impl<'a, T: 'a> Drop for Drain<'a, T> { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T: 'a> Iterator for Drain<'a, T> { type Item = T; @@ -1524,7 +1532,7 @@ impl<'a, T: 'a> Iterator for Drain<'a, T> { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T: 'a> DoubleEndedIterator for Drain<'a, T> { #[inline] fn next_back(&mut self) -> Option { @@ -1532,10 +1540,10 @@ impl<'a, T: 'a> DoubleEndedIterator for Drain<'a, T> { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T: 'a> ExactSizeIterator for Drain<'a, T> {} -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl PartialEq for RingBuf { fn eq(&self, other: &RingBuf) -> bool { self.len() == other.len() && @@ -1543,17 +1551,17 @@ impl PartialEq for RingBuf { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Eq for RingBuf {} -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl PartialOrd for RingBuf { fn partial_cmp(&self, other: &RingBuf) -> Option { iter::order::partial_cmp(self.iter(), other.iter()) } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Ord for RingBuf { #[inline] fn cmp(&self, other: &RingBuf) -> Ordering { @@ -1561,7 +1569,7 @@ impl Ord for RingBuf { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl> Hash for RingBuf { fn hash(&self, state: &mut S) { self.len().hash(state); @@ -1571,7 +1579,7 @@ impl> Hash for RingBuf { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Index for RingBuf { type Output = A; @@ -1581,7 +1589,7 @@ impl Index for RingBuf { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl IndexMut for RingBuf { type Output = A; @@ -1591,7 +1599,7 @@ impl IndexMut for RingBuf { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl FromIterator for RingBuf { fn from_iter>(iterator: T) -> RingBuf { let (lower, _) = iterator.size_hint(); @@ -1601,7 +1609,7 @@ impl FromIterator for RingBuf { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Extend for RingBuf { fn extend>(&mut self, mut iterator: T) { for elt in iterator { @@ -1610,7 +1618,7 @@ impl Extend for RingBuf { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl fmt::Show for RingBuf { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { try!(write!(f, "RingBuf [")); diff --git a/src/libcollections/slice.rs b/src/libcollections/slice.rs index 988ec4c661f..697ed77f06f 100644 --- a/src/libcollections/slice.rs +++ b/src/libcollections/slice.rs @@ -86,7 +86,7 @@ //! * Further iterators exist that split, chunk or permute the slice. #![doc(primitive = "slice")] -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] use alloc::boxed::Box; use core::borrow::{BorrowFrom, BorrowFromMut, ToOwned}; @@ -120,9 +120,9 @@ pub use core::slice::{from_raw_buf, from_raw_mut_buf}; //////////////////////////////////////////////////////////////////////////////// /// Allocating extension methods for slices. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub trait SliceExt { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] type Item; /// Sorts the slice, in place, using `compare` to compare @@ -142,7 +142,7 @@ pub trait SliceExt { /// v.sort_by(|a, b| b.cmp(a)); /// assert!(v == [5, 4, 3, 2, 1]); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn sort_by(&mut self, compare: F) where F: FnMut(&Self::Item, &Self::Item) -> Ordering; /// Consumes `src` and moves as many elements as it can into `self` @@ -166,7 +166,8 @@ pub trait SliceExt { /// assert_eq!(num_moved, 3); /// assert!(a == [6i, 7, 8, 4, 5]); /// ``` - #[unstable = "uncertain about this API approach"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "uncertain about this API approach")] fn move_from(&mut self, src: Vec, start: uint, end: uint) -> uint; /// Returns a subslice spanning the interval [`start`, `end`). @@ -175,7 +176,8 @@ pub trait SliceExt { /// original slice (i.e. when `end > self.len()`) or when `start > end`. /// /// Slicing with `start` equal to `end` yields an empty slice. - #[unstable = "will be replaced by slice syntax"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "will be replaced by slice syntax")] fn slice(&self, start: uint, end: uint) -> &[Self::Item]; /// Returns a subslice from `start` to the end of the slice. @@ -183,7 +185,8 @@ pub trait SliceExt { /// Panics when `start` is strictly greater than the length of the original slice. /// /// Slicing from `self.len()` yields an empty slice. - #[unstable = "will be replaced by slice syntax"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "will be replaced by slice syntax")] fn slice_from(&self, start: uint) -> &[Self::Item]; /// Returns a subslice from the start of the slice to `end`. @@ -191,7 +194,8 @@ pub trait SliceExt { /// Panics when `end` is strictly greater than the length of the original slice. /// /// Slicing to `0` yields an empty slice. - #[unstable = "will be replaced by slice syntax"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "will be replaced by slice syntax")] fn slice_to(&self, end: uint) -> &[Self::Item]; /// Divides one slice into two at an index. @@ -201,23 +205,23 @@ pub trait SliceExt { /// indices from `[mid, len)` (excluding the index `len` itself). /// /// Panics if `mid > len`. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn split_at(&self, mid: uint) -> (&[Self::Item], &[Self::Item]); /// Returns an iterator over the slice - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn iter(&self) -> Iter; /// Returns an iterator over subslices separated by elements that match /// `pred`. The matched element is not contained in the subslices. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn split(&self, pred: F) -> Split where F: FnMut(&Self::Item) -> bool; /// Returns an iterator over subslices separated by elements that match /// `pred`, limited to splitting at most `n` times. The matched element is /// not contained in the subslices. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn splitn(&self, n: uint, pred: F) -> SplitN where F: FnMut(&Self::Item) -> bool; @@ -225,7 +229,7 @@ pub trait SliceExt { /// `pred` limited to splitting at most `n` times. This starts at the end of /// the slice and works backwards. The matched element is not contained in /// the subslices. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn rsplitn(&self, n: uint, pred: F) -> RSplitN where F: FnMut(&Self::Item) -> bool; @@ -248,7 +252,7 @@ pub trait SliceExt { /// println!("{:?}", win); /// } /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn windows(&self, size: uint) -> Windows; /// Returns an iterator over `size` elements of the slice at a @@ -271,33 +275,33 @@ pub trait SliceExt { /// println!("{:?}", win); /// } /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn chunks(&self, size: uint) -> Chunks; /// Returns the element of a slice at the given index, or `None` if the /// index is out of bounds. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn get(&self, index: uint) -> Option<&Self::Item>; /// Returns the first element of a slice, or `None` if it is empty. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn first(&self) -> Option<&Self::Item>; /// Returns all but the first element of a slice. - #[unstable = "likely to be renamed"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "likely to be renamed")] fn tail(&self) -> &[Self::Item]; /// Returns all but the last element of a slice. - #[unstable = "likely to be renamed"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "likely to be renamed")] fn init(&self) -> &[Self::Item]; /// Returns the last element of a slice, or `None` if it is empty. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn last(&self) -> Option<&Self::Item>; /// Returns a pointer to the element at the given index, without doing /// bounds checking. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] unsafe fn get_unchecked(&self, index: uint) -> &Self::Item; /// Returns an unsafe pointer to the slice's buffer @@ -307,7 +311,7 @@ pub trait SliceExt { /// /// Modifying the slice may cause its buffer to be reallocated, which /// would also make any pointers to it invalid. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn as_ptr(&self) -> *const Self::Item; /// Binary search a sorted slice with a comparator function. @@ -342,7 +346,7 @@ pub trait SliceExt { /// let r = s.binary_search_by(|probe| probe.cmp(&seek)); /// assert!(match r { Ok(1...4) => true, _ => false, }); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn binary_search_by(&self, f: F) -> Result where F: FnMut(&Self::Item) -> Ordering; @@ -354,7 +358,7 @@ pub trait SliceExt { /// let a = [1i, 2, 3]; /// assert_eq!(a.len(), 3); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn len(&self) -> uint; /// Returns true if the slice has a length of 0 @@ -366,16 +370,16 @@ pub trait SliceExt { /// assert!(!a.is_empty()); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn is_empty(&self) -> bool { self.len() == 0 } /// Returns a mutable reference to the element at the given index, /// or `None` if the index is out of bounds - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn get_mut(&mut self, index: uint) -> Option<&mut Self::Item>; /// Work with `self` as a mut slice. /// Primarily intended for getting a &mut [T] from a [T; N]. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn as_mut_slice(&mut self) -> &mut [Self::Item]; /// Returns a mutable subslice spanning the interval [`start`, `end`). @@ -384,7 +388,8 @@ pub trait SliceExt { /// original slice (i.e. when `end > self.len()`) or when `start > end`. /// /// Slicing with `start` equal to `end` yields an empty slice. - #[unstable = "will be replaced by slice syntax"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "will be replaced by slice syntax")] fn slice_mut(&mut self, start: uint, end: uint) -> &mut [Self::Item]; /// Returns a mutable subslice from `start` to the end of the slice. @@ -392,7 +397,8 @@ pub trait SliceExt { /// Panics when `start` is strictly greater than the length of the original slice. /// /// Slicing from `self.len()` yields an empty slice. - #[unstable = "will be replaced by slice syntax"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "will be replaced by slice syntax")] fn slice_from_mut(&mut self, start: uint) -> &mut [Self::Item]; /// Returns a mutable subslice from the start of the slice to `end`. @@ -400,39 +406,42 @@ pub trait SliceExt { /// Panics when `end` is strictly greater than the length of the original slice. /// /// Slicing to `0` yields an empty slice. - #[unstable = "will be replaced by slice syntax"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "will be replaced by slice syntax")] fn slice_to_mut(&mut self, end: uint) -> &mut [Self::Item]; /// Returns an iterator that allows modifying each value - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn iter_mut(&mut self) -> IterMut; /// Returns a mutable pointer to the first element of a slice, or `None` if it is empty - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn first_mut(&mut self) -> Option<&mut Self::Item>; /// Returns all but the first element of a mutable slice - #[unstable = "likely to be renamed or removed"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "likely to be renamed or removed")] fn tail_mut(&mut self) -> &mut [Self::Item]; /// Returns all but the last element of a mutable slice - #[unstable = "likely to be renamed or removed"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "likely to be renamed or removed")] fn init_mut(&mut self) -> &mut [Self::Item]; /// Returns a mutable pointer to the last item in the slice. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn last_mut(&mut self) -> Option<&mut Self::Item>; /// Returns an iterator over mutable subslices separated by elements that /// match `pred`. The matched element is not contained in the subslices. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn split_mut(&mut self, pred: F) -> SplitMut where F: FnMut(&Self::Item) -> bool; /// Returns an iterator over subslices separated by elements that match /// `pred`, limited to splitting at most `n` times. The matched element is /// not contained in the subslices. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn splitn_mut(&mut self, n: uint, pred: F) -> SplitNMut where F: FnMut(&Self::Item) -> bool; @@ -440,7 +449,7 @@ pub trait SliceExt { /// `pred` limited to splitting at most `n` times. This starts at the end of /// the slice and works backwards. The matched element is not contained in /// the subslices. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn rsplitn_mut(&mut self, n: uint, pred: F) -> RSplitNMut where F: FnMut(&Self::Item) -> bool; @@ -452,7 +461,7 @@ pub trait SliceExt { /// # Panics /// /// Panics if `chunk_size` is 0. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn chunks_mut(&mut self, chunk_size: uint) -> ChunksMut; /// Swaps two elements in a slice. @@ -473,7 +482,7 @@ pub trait SliceExt { /// v.swap(1, 3); /// assert!(v == ["a", "d", "c", "b"]); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn swap(&mut self, a: uint, b: uint); /// Divides one `&mut` into two at an index. @@ -510,7 +519,7 @@ pub trait SliceExt { /// assert!(right == []); /// } /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn split_at_mut(&mut self, mid: uint) -> (&mut [Self::Item], &mut [Self::Item]); /// Reverse the order of elements in a slice, in place. @@ -522,11 +531,11 @@ pub trait SliceExt { /// v.reverse(); /// assert!(v == [3i, 2, 1]); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn reverse(&mut self); /// Returns an unsafe mutable pointer to the element in index - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] unsafe fn get_unchecked_mut(&mut self, index: uint) -> &mut Self::Item; /// Return an unsafe mutable pointer to the slice's buffer. @@ -537,11 +546,11 @@ pub trait SliceExt { /// Modifying the slice may cause its buffer to be reallocated, which /// would also make any pointers to it invalid. #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn as_mut_ptr(&mut self) -> *mut Self::Item; /// Copies `self` into a new `Vec`. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn to_vec(&self) -> Vec where Self::Item: Clone; /// Creates an iterator that yields every possible permutation of the @@ -568,7 +577,7 @@ pub trait SliceExt { /// assert_eq!(Some(vec![1i, 3, 2]), perms.next()); /// assert_eq!(Some(vec![3i, 1, 2]), perms.next()); /// ``` - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] fn permutations(&self) -> Permutations where Self::Item: Clone; /// Copies as many elements from `src` as it can into `self` (the @@ -588,7 +597,7 @@ pub trait SliceExt { /// assert!(dst.clone_from_slice(&src2) == 3); /// assert!(dst == [3i, 4, 5]); /// ``` - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] fn clone_from_slice(&mut self, &[Self::Item]) -> uint where Self::Item: Clone; /// Sorts the slice, in place. @@ -603,7 +612,7 @@ pub trait SliceExt { /// v.sort(); /// assert!(v == [-5i, -3, 1, 2, 4]); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn sort(&mut self) where Self::Item: Ord; /// Binary search a sorted slice for a given element. @@ -629,11 +638,11 @@ pub trait SliceExt { /// let r = s.binary_search(&1); /// assert!(match r { Ok(1...4) => true, _ => false, }); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn binary_search(&self, x: &Self::Item) -> Result where Self::Item: Ord; /// Deprecated: use `binary_search` instead. - #[deprecated = "use binary_search instead"] + #[deprecated(feature = "oldstuff", since = "1.0.0", reason = "use binary_search instead")] fn binary_search_elem(&self, x: &Self::Item) -> Result where Self::Item: Ord { self.binary_search(x) } @@ -654,7 +663,8 @@ pub trait SliceExt { /// let b: &mut [_] = &mut [1i, 0, 2]; /// assert!(v == b); /// ``` - #[unstable = "uncertain if this merits inclusion in std"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "uncertain if this merits inclusion in std")] fn next_permutation(&mut self) -> bool where Self::Item: Ord; /// Mutates the slice to the previous lexicographic permutation. @@ -673,35 +683,36 @@ pub trait SliceExt { /// let b: &mut [_] = &mut [0i, 1, 2]; /// assert!(v == b); /// ``` - #[unstable = "uncertain if this merits inclusion in std"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "uncertain if this merits inclusion in std")] fn prev_permutation(&mut self) -> bool where Self::Item: Ord; /// Find the first index containing a matching value. - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] fn position_elem(&self, t: &Self::Item) -> Option where Self::Item: PartialEq; /// Find the last index containing a matching value. - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] fn rposition_elem(&self, t: &Self::Item) -> Option where Self::Item: PartialEq; /// Return true if the slice contains an element with the given value. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn contains(&self, x: &Self::Item) -> bool where Self::Item: PartialEq; /// Returns true if `needle` is a prefix of the slice. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn starts_with(&self, needle: &[Self::Item]) -> bool where Self::Item: PartialEq; /// Returns true if `needle` is a suffix of the slice. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn ends_with(&self, needle: &[Self::Item]) -> bool where Self::Item: PartialEq; /// Convert `self` into a vector without clones or allocation. - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] fn into_vec(self: Box) -> Vec; } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl SliceExt for [T] { type Item = T; @@ -989,16 +1000,16 @@ impl SliceExt for [T] { //////////////////////////////////////////////////////////////////////////////// // Extension traits for slices over specific kinds of data //////////////////////////////////////////////////////////////////////////////// -#[unstable = "U should be an associated type"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "U should be an associated type")] /// An extension trait for concatenating slices pub trait SliceConcatExt { /// Flattens a slice of `T` into a single value `U`. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn concat(&self) -> U; /// Flattens a slice of `T` into a single value `U`, placing a /// given separator between each. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn connect(&self, sep: &T) -> U; } @@ -1034,7 +1045,7 @@ impl> SliceConcatExt> for [V] { /// /// The last generated swap is always (0, 1), and it returns the /// sequence to its initial order. -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] #[derive(Clone)] pub struct ElementSwaps { sdir: Vec, @@ -1046,7 +1057,7 @@ pub struct ElementSwaps { impl ElementSwaps { /// Creates an `ElementSwaps` iterator for a sequence of `length` elements. - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn new(length: uint) -> ElementSwaps { // Initialize `sdir` with a direction that position should move in // (all negative at the beginning) and the `size` of the @@ -1063,17 +1074,17 @@ impl ElementSwaps { // Standard trait implementations for slices //////////////////////////////////////////////////////////////////////////////// -#[unstable = "trait is unstable"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "trait is unstable")] impl BorrowFrom> for [T] { fn borrow_from(owned: &Vec) -> &[T] { &owned[] } } -#[unstable = "trait is unstable"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "trait is unstable")] impl BorrowFromMut> for [T] { fn borrow_from_mut(owned: &mut Vec) -> &mut [T] { &mut owned[] } } -#[unstable = "trait is unstable"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "trait is unstable")] impl ToOwned> for [T] { fn to_owned(&self) -> Vec { self.to_vec() } } @@ -1092,7 +1103,7 @@ struct SizeDirection { dir: Direction, } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Iterator for ElementSwaps { type Item = (uint, uint); @@ -1155,13 +1166,13 @@ impl Iterator for ElementSwaps { /// swap applied. /// /// Generates even and odd permutations alternately. -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] pub struct Permutations { swaps: ElementSwaps, v: Vec, } -#[unstable = "trait is unstable"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "trait is unstable")] impl Iterator for Permutations { type Item = Vec; diff --git a/src/libcollections/str.rs b/src/libcollections/str.rs index f7668930660..e5e612b8128 100644 --- a/src/libcollections/str.rs +++ b/src/libcollections/str.rs @@ -50,7 +50,7 @@ //! is the same as `&[u8]`. #![doc(primitive = "str")] -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] use self::RecompositionState::*; use self::DecompositionType::*; @@ -165,7 +165,7 @@ enum DecompositionType { /// External iterator for a string's decomposition's characters. /// Use with the `std::iter` module. #[derive(Clone)] -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] pub struct Decompositions<'a> { kind: DecompositionType, iter: Chars<'a>, @@ -173,7 +173,7 @@ pub struct Decompositions<'a> { sorted: bool } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a> Iterator for Decompositions<'a> { type Item = char; @@ -255,7 +255,7 @@ enum RecompositionState { /// External iterator for a string's recomposition's characters. /// Use with the `std::iter` module. #[derive(Clone)] -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] pub struct Recompositions<'a> { iter: Decompositions<'a>, state: RecompositionState, @@ -264,7 +264,7 @@ pub struct Recompositions<'a> { last_ccc: Option } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a> Iterator for Recompositions<'a> { type Item = char; @@ -352,12 +352,12 @@ impl<'a> Iterator for Recompositions<'a> { /// External iterator for a string's UTF16 codeunits. /// Use with the `std::iter` module. #[derive(Clone)] -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] pub struct Utf16Units<'a> { encoder: Utf16Encoder> } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a> Iterator for Utf16Units<'a> { type Item = u16; @@ -384,12 +384,12 @@ macro_rules! utf8_acc_cont_byte { ($ch:expr, $byte:expr) => (($ch << 6) | ($byte & 63u8) as u32) } -#[unstable = "trait is unstable"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "trait is unstable")] impl BorrowFrom for str { fn borrow_from(owned: &String) -> &str { &owned[] } } -#[unstable = "trait is unstable"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "trait is unstable")] impl ToOwned for str { fn to_owned(&self) -> String { unsafe { @@ -407,16 +407,18 @@ Section: Trait implementations */ /// Any string that can be represented as a slice. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub trait StrExt: Index { /// Escapes each char in `s` with `char::escape_default`. - #[unstable = "return type may change to be an iterator"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "return type may change to be an iterator")] fn escape_default(&self) -> String { self.chars().flat_map(|c| c.escape_default()).collect() } /// Escapes each char in `s` with `char::escape_unicode`. - #[unstable = "return type may change to be an iterator"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "return type may change to be an iterator")] fn escape_unicode(&self) -> String { self.chars().flat_map(|c| c.escape_unicode()).collect() } @@ -445,7 +447,7 @@ pub trait StrExt: Index { /// // not found, so no change. /// assert_eq!(s.replace("cookie monster", "little lamb"), s); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn replace(&self, from: &str, to: &str) -> String { let mut result = String::new(); let mut last_end = 0; @@ -461,7 +463,8 @@ pub trait StrExt: Index { /// Returns an iterator over the string in Unicode Normalization Form D /// (canonical decomposition). #[inline] - #[unstable = "this functionality may be moved to libunicode"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "this functionality may be moved to libunicode")] fn nfd_chars<'a>(&'a self) -> Decompositions<'a> { Decompositions { iter: self[].chars(), @@ -474,7 +477,8 @@ pub trait StrExt: Index { /// Returns an iterator over the string in Unicode Normalization Form KD /// (compatibility decomposition). #[inline] - #[unstable = "this functionality may be moved to libunicode"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "this functionality may be moved to libunicode")] fn nfkd_chars<'a>(&'a self) -> Decompositions<'a> { Decompositions { iter: self[].chars(), @@ -487,7 +491,8 @@ pub trait StrExt: Index { /// An Iterator over the string in Unicode Normalization Form C /// (canonical decomposition followed by canonical composition). #[inline] - #[unstable = "this functionality may be moved to libunicode"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "this functionality may be moved to libunicode")] fn nfc_chars<'a>(&'a self) -> Recompositions<'a> { Recompositions { iter: self.nfd_chars(), @@ -501,7 +506,8 @@ pub trait StrExt: Index { /// An Iterator over the string in Unicode Normalization Form KC /// (compatibility decomposition followed by canonical composition). #[inline] - #[unstable = "this functionality may be moved to libunicode"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "this functionality may be moved to libunicode")] fn nfkc_chars<'a>(&'a self) -> Recompositions<'a> { Recompositions { iter: self.nfkd_chars(), @@ -523,7 +529,7 @@ pub trait StrExt: Index { /// ```rust /// assert!("bananas".contains("nana")); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn contains(&self, pat: &str) -> bool { core_str::StrExt::contains(&self[], pat) } @@ -539,7 +545,8 @@ pub trait StrExt: Index { /// ```rust /// assert!("hello".contains_char('e')); /// ``` - #[unstable = "might get removed in favour of a more generic contains()"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "might get removed in favour of a more generic contains()")] fn contains_char(&self, pat: P) -> bool { core_str::StrExt::contains_char(&self[], pat) } @@ -553,7 +560,7 @@ pub trait StrExt: Index { /// let v: Vec = "abc åäö".chars().collect(); /// assert_eq!(v, vec!['a', 'b', 'c', ' ', 'å', 'ä', 'ö']); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn chars(&self) -> Chars { core_str::StrExt::chars(&self[]) } @@ -566,13 +573,13 @@ pub trait StrExt: Index { /// let v: Vec = "bors".bytes().collect(); /// assert_eq!(v, b"bors".to_vec()); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn bytes(&self) -> Bytes { core_str::StrExt::bytes(&self[]) } /// An iterator over the characters of `self` and their byte offsets. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn char_indices(&self) -> CharIndices { core_str::StrExt::char_indices(&self[]) } @@ -595,7 +602,7 @@ pub trait StrExt: Index { /// let v: Vec<&str> = "".split('X').collect(); /// assert_eq!(v, vec![""]); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn split(&self, pat: P) -> Split

{ core_str::StrExt::split(&self[], pat) } @@ -622,7 +629,7 @@ pub trait StrExt: Index { /// let v: Vec<&str> = "".splitn(1, 'X').collect(); /// assert_eq!(v, vec![""]); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn splitn(&self, count: uint, pat: P) -> SplitN

{ core_str::StrExt::splitn(&self[], count, pat) } @@ -651,7 +658,7 @@ pub trait StrExt: Index { /// let v: Vec<&str> = "lionXXtigerXleopard".split('X').rev().collect(); /// assert_eq!(v, vec!["leopard", "tiger", "", "lion"]); /// ``` - #[unstable = "might get removed"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "might get removed")] fn split_terminator(&self, pat: P) -> SplitTerminator

{ core_str::StrExt::split_terminator(&self[], pat) } @@ -672,7 +679,7 @@ pub trait StrExt: Index { /// let v: Vec<&str> = "lionXXtigerXleopard".rsplitn(2, 'X').collect(); /// assert_eq!(v, vec!["leopard", "tiger", "lionX"]); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn rsplitn(&self, count: uint, pat: P) -> RSplitN

{ core_str::StrExt::rsplitn(&self[], count, pat) } @@ -697,7 +704,8 @@ pub trait StrExt: Index { /// let v: Vec<(uint, uint)> = "ababa".match_indices("aba").collect(); /// assert_eq!(v, vec![(0, 3)]); // only the first `aba` /// ``` - #[unstable = "might have its iterator type changed"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "might have its iterator type changed")] fn match_indices<'a>(&'a self, pat: &'a str) -> MatchIndices<'a> { core_str::StrExt::match_indices(&self[], pat) } @@ -713,7 +721,8 @@ pub trait StrExt: Index { /// let v: Vec<&str> = "1abcabc2".split_str("abc").collect(); /// assert_eq!(v, vec!["1", "", "2"]); /// ``` - #[unstable = "might get removed in the future in favor of a more generic split()"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "might get removed in the future in favor of a more generic split()")] fn split_str<'a>(&'a self, pat: &'a str) -> SplitStr<'a> { core_str::StrExt::split_str(&self[], pat) } @@ -729,7 +738,7 @@ pub trait StrExt: Index { /// let v: Vec<&str> = four_lines.lines().collect(); /// assert_eq!(v, vec!["foo", "bar", "", "baz"]); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn lines(&self) -> Lines { core_str::StrExt::lines(&self[]) } @@ -745,7 +754,7 @@ pub trait StrExt: Index { /// let v: Vec<&str> = four_lines.lines_any().collect(); /// assert_eq!(v, vec!["foo", "bar", "", "baz"]); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn lines_any(&self) -> LinesAny { core_str::StrExt::lines_any(&self[]) } @@ -780,7 +789,8 @@ pub trait StrExt: Index { /// // byte 100 is outside the string /// // s.slice(3, 100); /// ``` - #[unstable = "use slice notation [a..b] instead"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "use slice notation [a..b] instead")] fn slice(&self, begin: uint, end: uint) -> &str { core_str::StrExt::slice(&self[], begin, end) } @@ -793,7 +803,8 @@ pub trait StrExt: Index { /// out of bounds. /// /// See also `slice`, `slice_to` and `slice_chars`. - #[unstable = "use slice notation [a..] instead"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "use slice notation [a..] instead")] fn slice_from(&self, begin: uint) -> &str { core_str::StrExt::slice_from(&self[], begin) } @@ -807,7 +818,8 @@ pub trait StrExt: Index { /// out of bounds. /// /// See also `slice`, `slice_from` and `slice_chars`. - #[unstable = "use slice notation [..a] instead"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "use slice notation [..a] instead")] fn slice_to(&self, end: uint) -> &str { core_str::StrExt::slice_to(&self[], end) } @@ -835,7 +847,8 @@ pub trait StrExt: Index { /// assert_eq!(s.slice_chars(0, 4), "Löwe"); /// assert_eq!(s.slice_chars(5, 7), "老虎"); /// ``` - #[unstable = "may have yet to prove its worth"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "may have yet to prove its worth")] fn slice_chars(&self, begin: uint, end: uint) -> &str { core_str::StrExt::slice_chars(&self[], begin, end) } @@ -846,7 +859,7 @@ pub trait StrExt: Index { /// /// Caller must check both UTF-8 character boundaries and the boundaries of /// the entire slice as well. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] unsafe fn slice_unchecked(&self, begin: uint, end: uint) -> &str { core_str::StrExt::slice_unchecked(&self[], begin, end) } @@ -858,7 +871,7 @@ pub trait StrExt: Index { /// ```rust /// assert!("banana".starts_with("ba")); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn starts_with(&self, pat: &str) -> bool { core_str::StrExt::starts_with(&self[], pat) } @@ -870,7 +883,7 @@ pub trait StrExt: Index { /// ```rust /// assert!("banana".ends_with("nana")); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn ends_with(&self, pat: &str) -> bool { core_str::StrExt::ends_with(&self[], pat) } @@ -890,7 +903,7 @@ pub trait StrExt: Index { /// assert_eq!("12foo1bar12".trim_matches(x), "foo1bar"); /// assert_eq!("123foo1bar123".trim_matches(|&: c: char| c.is_numeric()), "foo1bar"); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn trim_matches(&self, pat: P) -> &str { core_str::StrExt::trim_matches(&self[], pat) } @@ -910,7 +923,7 @@ pub trait StrExt: Index { /// assert_eq!("12foo1bar12".trim_left_matches(x), "foo1bar12"); /// assert_eq!("123foo1bar123".trim_left_matches(|&: c: char| c.is_numeric()), "foo1bar123"); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn trim_left_matches(&self, pat: P) -> &str { core_str::StrExt::trim_left_matches(&self[], pat) } @@ -930,7 +943,7 @@ pub trait StrExt: Index { /// assert_eq!("12foo1bar12".trim_right_matches(x), "12foo1bar"); /// assert_eq!("123foo1bar123".trim_right_matches(|&: c: char| c.is_numeric()), "123foo1bar"); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn trim_right_matches(&self, pat: P) -> &str { core_str::StrExt::trim_right_matches(&self[], pat) } @@ -958,7 +971,8 @@ pub trait StrExt: Index { /// // third byte of `老` /// assert!(!s.is_char_boundary(8)); /// ``` - #[unstable = "naming is uncertain with container conventions"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "naming is uncertain with container conventions")] fn is_char_boundary(&self, index: uint) -> bool { core_str::StrExt::is_char_boundary(&self[], index) } @@ -1016,7 +1030,8 @@ pub trait StrExt: Index { /// /// If `i` is greater than or equal to the length of the string. /// If `i` is not the index of the beginning of a valid UTF-8 character. - #[unstable = "naming is uncertain with container conventions"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "naming is uncertain with container conventions")] fn char_range_at(&self, start: uint) -> CharRange { core_str::StrExt::char_range_at(&self[], start) } @@ -1031,7 +1046,8 @@ pub trait StrExt: Index { /// /// If `i` is greater than the length of the string. /// If `i` is not an index following a valid UTF-8 character. - #[unstable = "naming is uncertain with container conventions"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "naming is uncertain with container conventions")] fn char_range_at_reverse(&self, start: uint) -> CharRange { core_str::StrExt::char_range_at_reverse(&self[], start) } @@ -1051,7 +1067,8 @@ pub trait StrExt: Index { /// /// If `i` is greater than or equal to the length of the string. /// If `i` is not the index of the beginning of a valid UTF-8 character. - #[unstable = "naming is uncertain with container conventions"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "naming is uncertain with container conventions")] fn char_at(&self, i: uint) -> char { core_str::StrExt::char_at(&self[], i) } @@ -1062,7 +1079,8 @@ pub trait StrExt: Index { /// /// If `i` is greater than the length of the string. /// If `i` is not an index following a valid UTF-8 character. - #[unstable = "naming is uncertain with container conventions"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "naming is uncertain with container conventions")] fn char_at_reverse(&self, i: uint) -> char { core_str::StrExt::char_at_reverse(&self[], i) } @@ -1074,7 +1092,7 @@ pub trait StrExt: Index { /// ```rust /// assert_eq!("bors".as_bytes(), b"bors"); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn as_bytes(&self) -> &[u8] { core_str::StrExt::as_bytes(&self[]) } @@ -1102,7 +1120,7 @@ pub trait StrExt: Index { /// let x: &[_] = &['1', '2']; /// assert_eq!(s.find(x), None); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn find(&self, pat: P) -> Option { core_str::StrExt::find(&self[], pat) } @@ -1130,7 +1148,7 @@ pub trait StrExt: Index { /// let x: &[_] = &['1', '2']; /// assert_eq!(s.rfind(x), None); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn rfind(&self, pat: P) -> Option { core_str::StrExt::rfind(&self[], pat) } @@ -1154,7 +1172,8 @@ pub trait StrExt: Index { /// assert_eq!(s.find_str("老虎 L"), Some(6)); /// assert_eq!(s.find_str("muffin man"), None); /// ``` - #[unstable = "might get removed in favor of a more generic find in the future"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "might get removed in favor of a more generic find in the future")] fn find_str(&self, needle: &str) -> Option { core_str::StrExt::find_str(&self[], needle) } @@ -1177,7 +1196,8 @@ pub trait StrExt: Index { /// assert_eq!(c, 'ö'); /// assert_eq!(s2, "we 老虎 Léopard"); /// ``` - #[unstable = "awaiting conventions about shifting and slices"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "awaiting conventions about shifting and slices")] fn slice_shift_char(&self) -> Option<(char, &str)> { core_str::StrExt::slice_shift_char(&self[]) } @@ -1196,7 +1216,8 @@ pub trait StrExt: Index { /// assert!(string.subslice_offset(lines[1]) == 2); // &"b" /// assert!(string.subslice_offset(lines[2]) == 4); // &"c" /// ``` - #[unstable = "awaiting convention about comparability of arbitrary slices"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "awaiting convention about comparability of arbitrary slices")] fn subslice_offset(&self, inner: &str) -> uint { core_str::StrExt::subslice_offset(&self[], inner) } @@ -1206,14 +1227,15 @@ pub trait StrExt: Index { /// The caller must ensure that the string outlives this pointer, /// and that it is not reallocated (e.g. by pushing to the /// string). - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] #[inline] fn as_ptr(&self) -> *const u8 { core_str::StrExt::as_ptr(&self[]) } /// Return an iterator of `u16` over the string encoded as UTF-16. - #[unstable = "this functionality may only be provided by libunicode"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "this functionality may only be provided by libunicode")] fn utf16_units(&self) -> Utf16Units { Utf16Units { encoder: Utf16Encoder::new(self[].chars()) } } @@ -1226,7 +1248,7 @@ pub trait StrExt: Index { /// assert_eq!("foo".len(), 3); /// assert_eq!("ƒoo".len(), 4); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] #[inline] fn len(&self) -> uint { core_str::StrExt::len(&self[]) @@ -1240,7 +1262,7 @@ pub trait StrExt: Index { /// assert!("".is_empty()); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn is_empty(&self) -> bool { core_str::StrExt::is_empty(&self[]) } @@ -1254,7 +1276,8 @@ pub trait StrExt: Index { /// assert_eq!("j".parse::(), None); /// ``` #[inline] - #[unstable = "this method was just created"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "this method was just created")] fn parse(&self) -> Option { core_str::StrExt::parse(&self[]) } @@ -1278,7 +1301,8 @@ pub trait StrExt: Index { /// let b: &[_] = &["a", "\r\n", "b", "🇷🇺🇸🇹"]; /// assert_eq!(gr2.as_slice(), b); /// ``` - #[unstable = "this functionality may only be provided by libunicode"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "this functionality may only be provided by libunicode")] fn graphemes(&self, is_extended: bool) -> Graphemes { UnicodeStr::graphemes(&self[], is_extended) } @@ -1293,7 +1317,8 @@ pub trait StrExt: Index { /// let b: &[_] = &[(0u, "a̐"), (3, "é"), (6, "ö̲"), (11, "\r\n")]; /// assert_eq!(gr_inds.as_slice(), b); /// ``` - #[unstable = "this functionality may only be provided by libunicode"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "this functionality may only be provided by libunicode")] fn grapheme_indices(&self, is_extended: bool) -> GraphemeIndices { UnicodeStr::grapheme_indices(&self[], is_extended) } @@ -1309,7 +1334,7 @@ pub trait StrExt: Index { /// let v: Vec<&str> = some_words.words().collect(); /// assert_eq!(v, vec!["Mary", "had", "a", "little", "lamb"]); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn words(&self) -> Words { UnicodeStr::words(&self[]) } @@ -1323,31 +1348,32 @@ pub trait StrExt: Index { /// [Unicode Standard Annex #11](http://www.unicode.org/reports/tr11/) /// recommends that these characters be treated as 1 column (i.e., /// `is_cjk` = `false`) if the locale is unknown. - #[unstable = "this functionality may only be provided by libunicode"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "this functionality may only be provided by libunicode")] fn width(&self, is_cjk: bool) -> uint { UnicodeStr::width(&self[], is_cjk) } /// Returns a string with leading and trailing whitespace removed. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn trim(&self) -> &str { UnicodeStr::trim(&self[]) } /// Returns a string with leading whitespace removed. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn trim_left(&self) -> &str { UnicodeStr::trim_left(&self[]) } /// Returns a string with trailing whitespace removed. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn trim_right(&self) -> &str { UnicodeStr::trim_right(&self[]) } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl StrExt for str {} #[cfg(test)] diff --git a/src/libcollections/string.rs b/src/libcollections/string.rs index 5d35d8a8679..d23be315481 100644 --- a/src/libcollections/string.rs +++ b/src/libcollections/string.rs @@ -12,7 +12,7 @@ //! An owned, growable string that enforces that its contents are valid UTF-8. -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] use core::prelude::*; @@ -33,20 +33,20 @@ use vec::{DerefVec, Vec, as_vec}; /// A growable string stored as a UTF-8 encoded buffer. #[derive(Clone, PartialOrd, Eq, Ord)] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct String { vec: Vec, } /// A possible error value from the `String::from_utf8` function. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct FromUtf8Error { bytes: Vec, error: Utf8Error, } /// A possible error value from the `String::from_utf16` function. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] #[allow(missing_copy_implementations)] pub struct FromUtf16Error(()); @@ -59,7 +59,7 @@ impl String { /// let mut s = String::new(); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn new() -> String { String { vec: Vec::new(), @@ -76,7 +76,7 @@ impl String { /// let mut s = String::with_capacity(10); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn with_capacity(capacity: uint) -> String { String { vec: Vec::with_capacity(capacity), @@ -92,7 +92,8 @@ impl String { /// assert_eq!(s.as_slice(), "hello"); /// ``` #[inline] - #[unstable = "needs investigation to see if to_string() can match perf"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "needs investigation to see if to_string() can match perf")] pub fn from_str(string: &str) -> String { String { vec: ::slice::SliceExt::to_vec(string.as_bytes()) } } @@ -120,7 +121,7 @@ impl String { /// assert_eq!(s.into_bytes(), vec![240, 144, 128]); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn from_utf8(vec: Vec) -> Result { match str::from_utf8(vec.as_slice()) { Ok(..) => Ok(String { vec: vec }), @@ -138,7 +139,7 @@ impl String { /// let output = String::from_utf8_lossy(input); /// assert_eq!(output.as_slice(), "Hello \u{FFFD}World"); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn from_utf8_lossy<'a>(v: &'a [u8]) -> CowString<'a> { let mut i = 0; match str::from_utf8(v) { @@ -276,7 +277,7 @@ impl String { /// v[4] = 0xD800; /// assert!(String::from_utf16(v).is_err()); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn from_utf16(v: &[u16]) -> Result { let mut s = String::with_capacity(v.len()); for c in unicode_str::utf16_items(v) { @@ -303,7 +304,7 @@ impl String { /// "𝄞mus\u{FFFD}ic\u{FFFD}".to_string()); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn from_utf16_lossy(v: &[u16]) -> String { unicode_str::utf16_items(v).map(|c| c.to_char_lossy()).collect() } @@ -314,7 +315,7 @@ impl String { /// * We call `Vec::from_raw_parts` to get a `Vec`; /// * We assume that the `Vec` contains valid UTF-8. #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub unsafe fn from_raw_parts(buf: *mut u8, length: uint, capacity: uint) -> String { String { vec: Vec::from_raw_parts(buf, length, capacity), @@ -325,7 +326,7 @@ impl String { /// it contains valid UTF-8. This is unsafe because it assumes that /// the UTF-8-ness of the vector has already been validated. #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub unsafe fn from_utf8_unchecked(bytes: Vec) -> String { String { vec: bytes } } @@ -340,7 +341,7 @@ impl String { /// assert_eq!(bytes, vec![104, 101, 108, 108, 111]); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn into_bytes(self) -> Vec { self.vec } @@ -355,7 +356,7 @@ impl String { /// assert_eq!(s.as_slice(), "foobar"); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn push_str(&mut self, string: &str) { self.vec.push_all(string.as_bytes()) } @@ -370,7 +371,7 @@ impl String { /// assert!(s.capacity() >= 10); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn capacity(&self) -> uint { self.vec.capacity() } @@ -391,7 +392,7 @@ impl String { /// assert!(s.capacity() >= 10); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn reserve(&mut self, additional: uint) { self.vec.reserve(additional) } @@ -416,7 +417,7 @@ impl String { /// assert!(s.capacity() >= 10); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn reserve_exact(&mut self, additional: uint) { self.vec.reserve_exact(additional) } @@ -433,7 +434,7 @@ impl String { /// assert_eq!(s.capacity(), 3); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn shrink_to_fit(&mut self) { self.vec.shrink_to_fit() } @@ -450,7 +451,7 @@ impl String { /// assert_eq!(s.as_slice(), "abc123"); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn push(&mut self, ch: char) { if (ch as u32) < 0x80 { self.vec.push(ch as u8); @@ -483,7 +484,7 @@ impl String { /// assert_eq!(s.as_bytes(), b); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn as_bytes<'a>(&'a self) -> &'a [u8] { self.vec.as_slice() } @@ -503,7 +504,7 @@ impl String { /// assert_eq!(s.as_slice(), "he"); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn truncate(&mut self, new_len: uint) { assert!(self.is_char_boundary(new_len)); self.vec.truncate(new_len) @@ -522,7 +523,7 @@ impl String { /// assert_eq!(s.pop(), None); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn pop(&mut self) -> Option { let len = self.len(); if len == 0 { @@ -558,7 +559,7 @@ impl String { /// assert_eq!(s.remove(0), 'o'); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn remove(&mut self, idx: uint) -> char { let len = self.len(); assert!(idx <= len); @@ -585,7 +586,7 @@ impl String { /// If `idx` does not lie on a character boundary or is out of bounds, then /// this function will panic. #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn insert(&mut self, idx: uint, ch: char) { let len = self.len(); assert!(idx <= len); @@ -622,7 +623,7 @@ impl String { /// assert_eq!(s.as_slice(), "olleh"); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub unsafe fn as_mut_vec<'a>(&'a mut self) -> &'a mut Vec { &mut self.vec } @@ -636,7 +637,7 @@ impl String { /// assert_eq!(a.len(), 3); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn len(&self) -> uint { self.vec.len() } /// Returns true if the string contains no bytes @@ -650,7 +651,7 @@ impl String { /// assert!(!v.is_empty()); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn is_empty(&self) -> bool { self.len() == 0 } /// Truncates the string, returning it to 0 length. @@ -663,7 +664,7 @@ impl String { /// assert!(s.is_empty()); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn clear(&mut self) { self.vec.clear() } @@ -672,11 +673,11 @@ impl String { impl FromUtf8Error { /// Consume this error, returning the bytes that were attempted to make a /// `String` with. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn into_bytes(self) -> Vec { self.bytes } /// Access the underlying UTF8-error that was the cause of this error. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn utf8_error(&self) -> Utf8Error { self.error } } @@ -686,7 +687,7 @@ impl fmt::Show for FromUtf8Error { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl fmt::String for FromUtf8Error { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fmt::String::fmt(&self.error, f) @@ -699,14 +700,14 @@ impl fmt::Show for FromUtf16Error { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl fmt::String for FromUtf16Error { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fmt::String::fmt("invalid utf-16: lone surrogate found", f) } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl FromIterator for String { fn from_iter>(iterator: I) -> String { let mut buf = String::new(); @@ -715,7 +716,7 @@ impl FromIterator for String { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a> FromIterator<&'a str> for String { fn from_iter>(iterator: I) -> String { let mut buf = String::new(); @@ -724,7 +725,8 @@ impl<'a> FromIterator<&'a str> for String { } } -#[unstable = "waiting on Extend stabilization"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "waiting on Extend stabilization")] impl Extend for String { fn extend>(&mut self, mut iterator: I) { let (lower_bound, _) = iterator.size_hint(); @@ -735,7 +737,8 @@ impl Extend for String { } } -#[unstable = "waiting on Extend stabilization"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "waiting on Extend stabilization")] impl<'a> Extend<&'a str> for String { fn extend>(&mut self, mut iterator: I) { // A guess that at least one byte per iterator element will be needed. @@ -747,7 +750,7 @@ impl<'a> Extend<&'a str> for String { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl PartialEq for String { #[inline] fn eq(&self, other: &String) -> bool { PartialEq::eq(&**self, &**other) } @@ -757,7 +760,7 @@ impl PartialEq for String { macro_rules! impl_eq { ($lhs:ty, $rhs: ty) => { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl<'a> PartialEq<$rhs> for $lhs { #[inline] fn eq(&self, other: &$rhs) -> bool { PartialEq::eq(&**self, &**other) } @@ -765,7 +768,7 @@ macro_rules! impl_eq { fn ne(&self, other: &$rhs) -> bool { PartialEq::ne(&**self, &**other) } } - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl<'a> PartialEq<$lhs> for $rhs { #[inline] fn eq(&self, other: &$lhs) -> bool { PartialEq::eq(&**self, &**other) } @@ -779,7 +782,7 @@ macro_rules! impl_eq { impl_eq! { String, &'a str } impl_eq! { CowString<'a>, String } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, 'b> PartialEq<&'b str> for CowString<'a> { #[inline] fn eq(&self, other: &&'b str) -> bool { PartialEq::eq(&**self, &**other) } @@ -787,7 +790,7 @@ impl<'a, 'b> PartialEq<&'b str> for CowString<'a> { fn ne(&self, other: &&'b str) -> bool { PartialEq::ne(&**self, &**other) } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, 'b> PartialEq> for &'b str { #[inline] fn eq(&self, other: &CowString<'a>) -> bool { PartialEq::eq(&**self, &**other) } @@ -795,25 +798,25 @@ impl<'a, 'b> PartialEq> for &'b str { fn ne(&self, other: &CowString<'a>) -> bool { PartialEq::ne(&**self, &**other) } } -#[unstable = "waiting on Str stabilization"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "waiting on Str stabilization")] impl Str for String { #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn as_slice<'a>(&'a self) -> &'a str { unsafe { mem::transmute(self.vec.as_slice()) } } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Default for String { #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn default() -> String { String::new() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl fmt::String for String { #[inline] fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { @@ -821,7 +824,7 @@ impl fmt::String for String { } } -#[unstable = "waiting on fmt stabilization"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "waiting on fmt stabilization")] impl fmt::Show for String { #[inline] fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { @@ -829,7 +832,7 @@ impl fmt::Show for String { } } -#[unstable = "waiting on Hash stabilization"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "waiting on Hash stabilization")] impl hash::Hash for String { #[inline] fn hash(&self, hasher: &mut H) { @@ -837,7 +840,8 @@ impl hash::Hash for String { } } -#[unstable = "recent addition, needs more experience"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "recent addition, needs more experience")] impl<'a> Add<&'a str> for String { type Output = String; @@ -877,7 +881,7 @@ impl ops::Index for String { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl ops::Deref for String { type Target = str; @@ -888,7 +892,7 @@ impl ops::Deref for String { } /// Wrapper type providing a `&String` reference via `Deref`. -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] pub struct DerefString<'a> { x: DerefVec<'a, u8> } @@ -916,7 +920,7 @@ impl<'a> Deref for DerefString<'a> { /// let string = as_string("foo").clone(); /// string_consumer(string); /// ``` -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn as_string<'a>(x: &'a str) -> DerefString<'a> { DerefString { x: as_vec(x.as_bytes()) } } @@ -960,7 +964,7 @@ impl<'a> IntoCow<'a, String, str> for &'a str { } /// A clone-on-write string -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub type CowString<'a> = Cow<'a, String, str>; impl<'a> Str for CowString<'a> { diff --git a/src/libcollections/vec.rs b/src/libcollections/vec.rs index 4ddab8c533a..4a8cd3e1645 100644 --- a/src/libcollections/vec.rs +++ b/src/libcollections/vec.rs @@ -44,7 +44,7 @@ //! let two = xs.pop(); //! ``` -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] use core::prelude::*; @@ -134,7 +134,7 @@ use core::uint; /// to reallocate, which can be slow. For this reason, it is recommended to use /// `Vec::with_capacity` whenever possible to specify how big the vector is expected to get. #[unsafe_no_drop_flag] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Vec { ptr: NonZero<*mut T>, len: uint, @@ -159,7 +159,7 @@ impl Vec { /// let mut vec: Vec = Vec::new(); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn new() -> Vec { // We want ptr to never be NULL so instead we set it to some arbitrary // non-null value which is fine since we never call deallocate on the ptr @@ -194,7 +194,7 @@ impl Vec { /// vec.push(11); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn with_capacity(capacity: uint) -> Vec { if mem::size_of::() == 0 { Vec { ptr: unsafe { NonZero::new(EMPTY as *mut T) }, len: 0, cap: uint::MAX } @@ -243,7 +243,7 @@ impl Vec { /// } /// } /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub unsafe fn from_raw_parts(ptr: *mut T, length: uint, capacity: uint) -> Vec { Vec { ptr: NonZero::new(ptr), len: length, cap: capacity } @@ -255,7 +255,8 @@ impl Vec { /// owned by the returned `Vec`. The elements of the buffer are copied into the vector /// without cloning, as if `ptr::read()` were called on them. #[inline] - #[unstable = "may be better expressed via composition"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "may be better expressed via composition")] pub unsafe fn from_raw_buf(ptr: *const T, elts: uint) -> Vec { let mut dst = Vec::with_capacity(elts); dst.set_len(elts); @@ -273,7 +274,7 @@ impl Vec { /// assert_eq!(vec.capacity(), 10); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn capacity(&self) -> uint { self.cap } @@ -292,7 +293,7 @@ impl Vec { /// vec.reserve(10); /// assert!(vec.capacity() >= 11); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn reserve(&mut self, additional: uint) { if self.cap - self.len < additional { let err_msg = "Vec::reserve: `uint` overflow"; @@ -321,7 +322,7 @@ impl Vec { /// vec.reserve_exact(10); /// assert!(vec.capacity() >= 11); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn reserve_exact(&mut self, additional: uint) { if self.cap - self.len < additional { match self.len.checked_add(additional) { @@ -345,7 +346,7 @@ impl Vec { /// vec.shrink_to_fit(); /// assert!(vec.capacity() >= 3); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn shrink_to_fit(&mut self) { if mem::size_of::() == 0 { return } @@ -376,7 +377,7 @@ impl Vec { /// Note that this will drop any excess capacity. Calling this and /// converting back to a vector with `into_vec()` is equivalent to calling /// `shrink_to_fit()`. - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn into_boxed_slice(mut self) -> Box<[T]> { self.shrink_to_fit(); unsafe { @@ -398,7 +399,7 @@ impl Vec { /// vec.truncate(2); /// assert_eq!(vec, vec![1, 2]); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn truncate(&mut self, len: uint) { unsafe { // drop any extra elements @@ -422,7 +423,7 @@ impl Vec { /// foo(vec.as_mut_slice()); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn as_mut_slice<'a>(&'a mut self) -> &'a mut [T] { unsafe { mem::transmute(RawSlice { @@ -446,7 +447,7 @@ impl Vec { /// } /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn into_iter(self) -> IntoIter { unsafe { let ptr = *self.ptr; @@ -477,7 +478,7 @@ impl Vec { /// } /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub unsafe fn set_len(&mut self, len: uint) { self.len = len; } @@ -503,7 +504,7 @@ impl Vec { /// assert_eq!(v, vec!["baz", "qux"]); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn swap_remove(&mut self, index: uint) -> T { let length = self.len(); self.swap(index, length - 1); @@ -527,7 +528,7 @@ impl Vec { /// vec.insert(4, 5); /// assert_eq!(vec, vec![1, 4, 2, 3, 5]); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn insert(&mut self, index: uint, element: T) { let len = self.len(); assert!(index <= len); @@ -563,7 +564,7 @@ impl Vec { /// assert_eq!(v.remove(1), 2); /// assert_eq!(v, vec![1, 3]); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn remove(&mut self, index: uint) -> T { let len = self.len(); assert!(index < len); @@ -597,7 +598,7 @@ impl Vec { /// vec.retain(|&x| x%2 == 0); /// assert_eq!(vec, vec![2, 4]); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn retain(&mut self, mut f: F) where F: FnMut(&T) -> bool { let len = self.len(); let mut del = 0u; @@ -631,7 +632,7 @@ impl Vec { /// assert_eq!(vec, vec!(1, 2, 3)); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn push(&mut self, value: T) { if mem::size_of::() == 0 { // zero-size types consume no memory, so we can't rely on the @@ -669,7 +670,7 @@ impl Vec { /// assert_eq!(vec, vec![1, 2]); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn pop(&mut self) -> Option { if self.len == 0 { None @@ -696,7 +697,8 @@ impl Vec { /// assert_eq!(vec2, vec![]); /// ``` #[inline] - #[unstable = "new API, waiting for dust to settle"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "new API, waiting for dust to settle")] pub fn append(&mut self, other: &mut Self) { if mem::size_of::() == 0 { // zero-size types consume no memory, so we can't rely on the @@ -732,7 +734,8 @@ impl Vec { /// assert!(v.is_empty()); /// ``` #[inline] - #[unstable = "matches collection reform specification, waiting for dust to settle"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "matches collection reform specification, waiting for dust to settle")] pub fn drain<'a>(&'a mut self) -> Drain<'a, T> { unsafe { let begin = *self.ptr as *const T; @@ -762,7 +765,7 @@ impl Vec { /// assert!(v.is_empty()); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn clear(&mut self) { self.truncate(0) } @@ -776,7 +779,7 @@ impl Vec { /// assert_eq!(a.len(), 3); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn len(&self) -> uint { self.len } /// Returns `true` if the vector contains no elements. @@ -790,7 +793,7 @@ impl Vec { /// v.push(1i); /// assert!(!v.is_empty()); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn is_empty(&self) -> bool { self.len() == 0 } /// Converts a `Vec` to a `Vec` where `T` and `U` have the same @@ -814,7 +817,8 @@ impl Vec { /// let newtyped_bytes = bytes.map_in_place(|x| Newtype(x)); /// assert_eq!(newtyped_bytes.as_slice(), [Newtype(0x11), Newtype(0x22)].as_slice()); /// ``` - #[unstable = "API may change to provide stronger guarantees"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "API may change to provide stronger guarantees")] pub fn map_in_place(self, mut f: F) -> Vec where F: FnMut(T) -> U { // FIXME: Assert statically that the types `T` and `U` have the same // size. @@ -1008,7 +1012,8 @@ impl Vec { /// vec.resize(2, 0); /// assert_eq!(vec, vec![1, 2]); /// ``` - #[unstable = "matches collection reform specification; waiting for dust to settle"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "matches collection reform specification; waiting for dust to settle")] pub fn resize(&mut self, new_len: uint, value: T) { let len = self.len(); @@ -1032,7 +1037,8 @@ impl Vec { /// assert_eq!(vec, vec![1, 2, 3, 4]); /// ``` #[inline] - #[unstable = "likely to be replaced by a more optimized extend"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "likely to be replaced by a more optimized extend")] pub fn push_all(&mut self, other: &[T]) { self.reserve(other.len()); @@ -1066,7 +1072,7 @@ impl Vec { /// /// assert_eq!(vec, vec![1i, 2, 3, 2]); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn dedup(&mut self) { unsafe { // Although we have a mutable reference to `self`, we cannot make @@ -1200,7 +1206,7 @@ unsafe fn dealloc(ptr: *mut T, len: uint) { // Common trait implementations for Vec //////////////////////////////////////////////////////////////////////////////// -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] impl Clone for Vec { fn clone(&self) -> Vec { ::slice::SliceExt::to_vec(self.as_slice()) } @@ -1229,7 +1235,7 @@ impl> Hash for Vec { } } -#[unstable = "waiting on Index stability"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "waiting on Index stability")] impl Index for Vec { type Output = T; @@ -1308,19 +1314,19 @@ impl ops::IndexMut for Vec { } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl ops::Deref for Vec { type Target = [T]; fn deref<'a>(&'a self) -> &'a [T] { self.as_slice() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl ops::DerefMut for Vec { fn deref_mut<'a>(&'a mut self) -> &'a mut [T] { self.as_mut_slice() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl FromIterator for Vec { #[inline] fn from_iter>(mut iterator: I) -> Vec { @@ -1333,7 +1339,7 @@ impl FromIterator for Vec { } } -#[unstable = "waiting on Extend stability"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "waiting on Extend stability")] impl Extend for Vec { #[inline] fn extend>(&mut self, mut iterator: I) { @@ -1408,7 +1414,8 @@ macro_rules! impl_eq_for_cowvec { impl_eq_for_cowvec! { &'b [B] } impl_eq_for_cowvec! { &'b mut [B] } -#[unstable = "waiting on PartialOrd stability"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "waiting on PartialOrd stability")] impl PartialOrd for Vec { #[inline] fn partial_cmp(&self, other: &Vec) -> Option { @@ -1416,10 +1423,10 @@ impl PartialOrd for Vec { } } -#[unstable = "waiting on Eq stability"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "waiting on Eq stability")] impl Eq for Vec {} -#[unstable = "waiting on Ord stability"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "waiting on Ord stability")] impl Ord for Vec { #[inline] fn cmp(&self, other: &Vec) -> Ordering { @@ -1439,7 +1446,7 @@ impl AsSlice for Vec { /// foo(vec.as_slice()); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn as_slice<'a>(&'a self) -> &'a [T] { unsafe { mem::transmute(RawSlice { @@ -1450,7 +1457,8 @@ impl AsSlice for Vec { } } -#[unstable = "recent addition, needs more experience"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "recent addition, needs more experience")] impl<'a, T: Clone> Add<&'a [T]> for Vec { type Output = Vec; @@ -1462,7 +1470,7 @@ impl<'a, T: Clone> Add<&'a [T]> for Vec { } #[unsafe_destructor] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Drop for Vec { fn drop(&mut self) { // This is (and should always remain) a no-op if the fields are @@ -1478,15 +1486,15 @@ impl Drop for Vec { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Default for Vec { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn default() -> Vec { Vec::new() } } -#[unstable = "waiting on Show stability"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "waiting on Show stability")] impl fmt::Show for Vec { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fmt::Show::fmt(self.as_slice(), f) @@ -1504,11 +1512,12 @@ impl<'a> fmt::Writer for Vec { // Clone-on-write //////////////////////////////////////////////////////////////////////////////// -#[unstable = "unclear how valuable this alias is"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "unclear how valuable this alias is")] /// A clone-on-write vector pub type CowVec<'a, T> = Cow<'a, Vec, [T]>; -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] impl<'a, T> FromIterator for CowVec<'a, T> where T: Clone { fn from_iter>(it: I) -> CowVec<'a, T> { Cow::Owned(FromIterator::from_iter(it)) @@ -1532,7 +1541,7 @@ impl<'a, T> IntoCow<'a, Vec, [T]> for &'a [T] where T: Clone { //////////////////////////////////////////////////////////////////////////////// /// An iterator that moves out of a vector. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct IntoIter { allocation: *mut T, // the block of memory allocated for the vector cap: uint, // the capacity of the vector @@ -1546,7 +1555,7 @@ unsafe impl Sync for IntoIter { } impl IntoIter { #[inline] /// Drops all items that have not yet been moved and returns the empty vector. - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn into_inner(mut self) -> Vec { unsafe { for _x in self { } @@ -1557,7 +1566,7 @@ impl IntoIter { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Iterator for IntoIter { type Item = T; @@ -1594,7 +1603,7 @@ impl Iterator for IntoIter { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl DoubleEndedIterator for IntoIter { #[inline] fn next_back<'a>(&'a mut self) -> Option { @@ -1618,11 +1627,11 @@ impl DoubleEndedIterator for IntoIter { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl ExactSizeIterator for IntoIter {} #[unsafe_destructor] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Drop for IntoIter { fn drop(&mut self) { // destroy the remaining elements @@ -1637,14 +1646,15 @@ impl Drop for IntoIter { /// An iterator that drains a vector. #[unsafe_no_drop_flag] -#[unstable = "recently added as part of collections reform 2"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "recently added as part of collections reform 2")] pub struct Drain<'a, T> { ptr: *const T, end: *const T, marker: ContravariantLifetime<'a>, } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T> Iterator for Drain<'a, T> { type Item = T; @@ -1681,7 +1691,7 @@ impl<'a, T> Iterator for Drain<'a, T> { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T> DoubleEndedIterator for Drain<'a, T> { #[inline] fn next_back(&mut self) -> Option { @@ -1705,11 +1715,11 @@ impl<'a, T> DoubleEndedIterator for Drain<'a, T> { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T> ExactSizeIterator for Drain<'a, T> {} #[unsafe_destructor] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T> Drop for Drain<'a, T> { fn drop(&mut self) { // self.ptr == self.end == null if drop has already been called, @@ -1725,13 +1735,13 @@ impl<'a, T> Drop for Drain<'a, T> { //////////////////////////////////////////////////////////////////////////////// /// Wrapper type providing a `&Vec` reference via `Deref`. -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] pub struct DerefVec<'a, T> { x: Vec, l: ContravariantLifetime<'a> } -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] impl<'a, T> Deref for DerefVec<'a, T> { type Target = Vec; @@ -1742,7 +1752,7 @@ impl<'a, T> Deref for DerefVec<'a, T> { // Prevent the inner `Vec` from attempting to deallocate memory. #[unsafe_destructor] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T> Drop for DerefVec<'a, T> { fn drop(&mut self) { self.x.len = 0; @@ -1751,7 +1761,7 @@ impl<'a, T> Drop for DerefVec<'a, T> { } /// Convert a slice to a wrapper type providing a `&Vec` reference. -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn as_vec<'a, T>(x: &'a [T]) -> DerefVec<'a, T> { unsafe { DerefVec { diff --git a/src/libcollections/vec_map.rs b/src/libcollections/vec_map.rs index 7ff2e953588..b45b86e3b97 100644 --- a/src/libcollections/vec_map.rs +++ b/src/libcollections/vec_map.rs @@ -66,9 +66,9 @@ pub struct VecMap { v: Vec>, } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Default for VecMap { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] #[inline] fn default() -> VecMap { VecMap::new() } } @@ -107,7 +107,7 @@ impl VecMap { /// use std::collections::VecMap; /// let mut map: VecMap<&str> = VecMap::new(); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn new() -> VecMap { VecMap { v: vec![] } } /// Creates an empty `VecMap` with space for at least `capacity` @@ -119,7 +119,7 @@ impl VecMap { /// use std::collections::VecMap; /// let mut map: VecMap<&str> = VecMap::with_capacity(10); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn with_capacity(capacity: uint) -> VecMap { VecMap { v: Vec::with_capacity(capacity) } } @@ -135,7 +135,7 @@ impl VecMap { /// assert!(map.capacity() >= 10); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn capacity(&self) -> uint { self.v.capacity() } @@ -154,7 +154,7 @@ impl VecMap { /// map.reserve_len(10); /// assert!(map.capacity() >= 10); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn reserve_len(&mut self, len: uint) { let cur_len = self.v.len(); if len >= cur_len { @@ -178,7 +178,7 @@ impl VecMap { /// map.reserve_len_exact(10); /// assert!(map.capacity() >= 10); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn reserve_len_exact(&mut self, len: uint) { let cur_len = self.v.len(); if len >= cur_len { @@ -188,7 +188,7 @@ impl VecMap { /// Returns an iterator visiting all keys in ascending order of the keys. /// The iterator's element type is `uint`. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn keys<'r>(&'r self) -> Keys<'r, V> { fn first((a, _): (A, B)) -> A { a } let first: fn((uint, &'r V)) -> uint = first; // coerce to fn pointer @@ -198,7 +198,7 @@ impl VecMap { /// Returns an iterator visiting all values in ascending order of the keys. /// The iterator's element type is `&'r V`. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn values<'r>(&'r self) -> Values<'r, V> { fn second((_, b): (A, B)) -> B { b } let second: fn((uint, &'r V)) -> &'r V = second; // coerce to fn pointer @@ -224,7 +224,7 @@ impl VecMap { /// println!("{}: {}", key, value); /// } /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn iter<'r>(&'r self) -> Iter<'r, V> { Iter { front: 0, @@ -255,7 +255,7 @@ impl VecMap { /// assert_eq!(value, &"x"); /// } /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn iter_mut<'r>(&'r mut self) -> IterMut<'r, V> { IterMut { front: 0, @@ -282,7 +282,7 @@ impl VecMap { /// /// assert_eq!(vec, vec![(1, "a"), (2, "b"), (3, "c")]); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn into_iter(self) -> IntoIter { fn filter((i, v): (uint, Option)) -> Option<(uint, A)> { v.map(|v| (i, v)) @@ -310,7 +310,8 @@ impl VecMap { /// /// assert_eq!(vec, vec![(1, "a"), (2, "b"), (3, "c")]); /// ``` - #[unstable = "matches collection reform specification, waiting for dust to settle"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "matches collection reform specification, waiting for dust to settle")] pub fn drain<'a>(&'a mut self) -> Drain<'a, V> { fn filter((i, v): (uint, Option)) -> Option<(uint, A)> { v.map(|v| (i, v)) @@ -332,7 +333,7 @@ impl VecMap { /// a.insert(1, "a"); /// assert_eq!(a.len(), 1); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn len(&self) -> uint { self.v.iter().filter(|elt| elt.is_some()).count() } @@ -349,7 +350,7 @@ impl VecMap { /// a.insert(1, "a"); /// assert!(!a.is_empty()); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn is_empty(&self) -> bool { self.v.iter().all(|elt| elt.is_none()) } @@ -366,7 +367,7 @@ impl VecMap { /// a.clear(); /// assert!(a.is_empty()); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn clear(&mut self) { self.v.clear() } /// Returns a reference to the value corresponding to the key. @@ -381,7 +382,7 @@ impl VecMap { /// assert_eq!(map.get(&1), Some(&"a")); /// assert_eq!(map.get(&2), None); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn get(&self, key: &uint) -> Option<&V> { if *key < self.v.len() { match self.v[*key] { @@ -406,7 +407,7 @@ impl VecMap { /// assert_eq!(map.contains_key(&2), false); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn contains_key(&self, key: &uint) -> bool { self.get(key).is_some() } @@ -426,7 +427,7 @@ impl VecMap { /// } /// assert_eq!(map[1], "b"); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn get_mut(&mut self, key: &uint) -> Option<&mut V> { if *key < self.v.len() { match *(&mut self.v[*key]) { @@ -454,7 +455,7 @@ impl VecMap { /// assert_eq!(map.insert(37, "c"), Some("b")); /// assert_eq!(map[37], "c"); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn insert(&mut self, key: uint, value: V) -> Option { let len = self.v.len(); if len <= key { @@ -476,7 +477,7 @@ impl VecMap { /// assert_eq!(map.remove(&1), Some("a")); /// assert_eq!(map.remove(&1), None); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn remove(&mut self, key: &uint) -> Option { if *key >= self.v.len() { return None; @@ -486,17 +487,17 @@ impl VecMap { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl PartialEq for VecMap { fn eq(&self, other: &VecMap) -> bool { iter::order::eq(self.iter(), other.iter()) } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Eq for VecMap {} -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl PartialOrd for VecMap { #[inline] fn partial_cmp(&self, other: &VecMap) -> Option { @@ -504,7 +505,7 @@ impl PartialOrd for VecMap { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Ord for VecMap { #[inline] fn cmp(&self, other: &VecMap) -> Ordering { @@ -512,7 +513,7 @@ impl Ord for VecMap { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl fmt::Show for VecMap { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { try!(write!(f, "VecMap {{")); @@ -526,7 +527,7 @@ impl fmt::Show for VecMap { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl FromIterator<(uint, V)> for VecMap { fn from_iter>(iter: Iter) -> VecMap { let mut map = VecMap::new(); @@ -535,7 +536,7 @@ impl FromIterator<(uint, V)> for VecMap { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Extend<(uint, V)> for VecMap { fn extend>(&mut self, mut iter: Iter) { for (k, v) in iter { @@ -553,7 +554,7 @@ impl Index for VecMap { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl IndexMut for VecMap { type Output = V; @@ -565,7 +566,7 @@ impl IndexMut for VecMap { macro_rules! iterator { (impl $name:ident -> $elem:ty, $($getter:ident),+) => { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, V> Iterator for $name<'a, V> { type Item = $elem; @@ -600,7 +601,7 @@ macro_rules! iterator { macro_rules! double_ended_iterator { (impl $name:ident -> $elem:ty, $($getter:ident),+) => { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, V> DoubleEndedIterator for $name<'a, V> { #[inline] fn next_back(&mut self) -> Option<$elem> { @@ -626,7 +627,7 @@ macro_rules! double_ended_iterator { } /// An iterator over the key-value pairs of a map. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Iter<'a, V:'a> { front: uint, back: uint, @@ -649,7 +650,7 @@ double_ended_iterator! { impl Iter -> (uint, &'a V), as_ref } /// An iterator over the key-value pairs of a map, with the /// values being mutable. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct IterMut<'a, V:'a> { front: uint, back: uint, @@ -660,7 +661,7 @@ iterator! { impl IterMut -> (uint, &'a mut V), as_mut } double_ended_iterator! { impl IterMut -> (uint, &'a mut V), as_mut } /// An iterator over the keys of a map. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Keys<'a, V: 'a> { iter: Map<(uint, &'a V), uint, Iter<'a, V>, fn((uint, &'a V)) -> uint> } @@ -675,7 +676,7 @@ impl<'a, V> Clone for Keys<'a, V> { } /// An iterator over the values of a map. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Values<'a, V: 'a> { iter: Map<(uint, &'a V), &'a V, Iter<'a, V>, fn((uint, &'a V)) -> &'a V> } @@ -690,7 +691,7 @@ impl<'a, V> Clone for Values<'a, V> { } /// A consuming iterator over the key-value pairs of a map. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct IntoIter { iter: FilterMap< (uint, Option), @@ -699,7 +700,7 @@ pub struct IntoIter { fn((uint, Option)) -> Option<(uint, V)>> } -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] pub struct Drain<'a, V> { iter: FilterMap< (uint, Option), @@ -708,7 +709,7 @@ pub struct Drain<'a, V> { fn((uint, Option)) -> Option<(uint, V)>> } -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] impl<'a, V> Iterator for Drain<'a, V> { type Item = (uint, V); @@ -716,43 +717,43 @@ impl<'a, V> Iterator for Drain<'a, V> { fn size_hint(&self) -> (uint, Option) { self.iter.size_hint() } } -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] impl<'a, V> DoubleEndedIterator for Drain<'a, V> { fn next_back(&mut self) -> Option<(uint, V)> { self.iter.next_back() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, V> Iterator for Keys<'a, V> { type Item = uint; fn next(&mut self) -> Option { self.iter.next() } fn size_hint(&self) -> (uint, Option) { self.iter.size_hint() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, V> DoubleEndedIterator for Keys<'a, V> { fn next_back(&mut self) -> Option { self.iter.next_back() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, V> Iterator for Values<'a, V> { type Item = &'a V; fn next(&mut self) -> Option<(&'a V)> { self.iter.next() } fn size_hint(&self) -> (uint, Option) { self.iter.size_hint() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, V> DoubleEndedIterator for Values<'a, V> { fn next_back(&mut self) -> Option<(&'a V)> { self.iter.next_back() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Iterator for IntoIter { type Item = (uint, V); fn next(&mut self) -> Option<(uint, V)> { self.iter.next() } fn size_hint(&self) -> (uint, Option) { self.iter.size_hint() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl DoubleEndedIterator for IntoIter { fn next_back(&mut self) -> Option<(uint, V)> { self.iter.next_back() } } diff --git a/src/libcore/any.rs b/src/libcore/any.rs index 20ed2253861..4ef4db2813e 100644 --- a/src/libcore/any.rs +++ b/src/libcore/any.rs @@ -69,7 +69,7 @@ //! } //! ``` -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] use mem::transmute; use option::Option::{self, Some, None}; @@ -86,10 +86,11 @@ use intrinsics; /// /// Every type with no non-`'static` references implements `Any`, so `Any` can /// be used as a trait object to emulate the effects dynamic typing. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub trait Any: 'static { /// Get the `TypeId` of `self` - #[unstable = "this method will likely be replaced by an associated static"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "this method will likely be replaced by an associated static")] fn get_type_id(&self) -> TypeId; } @@ -103,7 +104,7 @@ impl Any for T { impl Any { /// Returns true if the boxed type is the same as `T` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] #[inline] pub fn is(&self) -> bool { // Get TypeId of the type this function is instantiated with @@ -118,7 +119,7 @@ impl Any { /// Returns some reference to the boxed value if it is of type `T`, or /// `None` if it isn't. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] #[inline] pub fn downcast_ref(&self) -> Option<&T> { if self.is::() { @@ -136,7 +137,7 @@ impl Any { /// Returns some mutable reference to the boxed value if it is of type `T`, or /// `None` if it isn't. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] #[inline] pub fn downcast_mut(&mut self) -> Option<&mut T> { if self.is::() { @@ -167,7 +168,7 @@ impl Any { /// but this limitation may be removed in the future. #[cfg_attr(stage0, lang = "type_id")] #[derive(Clone, Copy, PartialEq, Eq, Show, Hash)] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct TypeId { t: u64, } @@ -176,7 +177,8 @@ impl TypeId { /// Returns the `TypeId` of the type this generic function has been /// instantiated with #[cfg(not(stage0))] - #[unstable = "may grow a `Reflect` bound soon via marker traits"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "may grow a `Reflect` bound soon via marker traits")] pub fn of() -> TypeId { TypeId { t: unsafe { intrinsics::type_id::() }, diff --git a/src/libcore/array.rs b/src/libcore/array.rs index 0cc31bf70de..86e8c4b4f03 100644 --- a/src/libcore/array.rs +++ b/src/libcore/array.rs @@ -12,7 +12,7 @@ //! up to a certain length. Eventually we should able to generalize //! to all lengths. -#![unstable] // not yet reviewed +#![unstable(feature = "unnamed_feature", since = "1.0.0")] // not yet reviewed use clone::Clone; use cmp::{PartialEq, Eq, PartialOrd, Ord, Ordering}; @@ -26,7 +26,7 @@ use option::Option; macro_rules! array_impls { ($($N:expr)+) => { $( - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl Clone for [T; $N] { fn clone(&self) -> [T; $N] { *self @@ -39,14 +39,15 @@ macro_rules! array_impls { } } - #[unstable = "waiting for Show to stabilize"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "waiting for Show to stabilize")] impl fmt::Show for [T; $N] { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fmt::Show::fmt(&&self[], f) } } - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl PartialEq<[B; $N]> for [A; $N] where A: PartialEq { #[inline] fn eq(&self, other: &[B; $N]) -> bool { @@ -58,7 +59,7 @@ macro_rules! array_impls { } } - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, A, B, Rhs> PartialEq for [A; $N] where A: PartialEq, Rhs: Deref, @@ -73,7 +74,7 @@ macro_rules! array_impls { } } - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, A, B, Lhs> PartialEq<[B; $N]> for Lhs where A: PartialEq, Lhs: Deref @@ -88,10 +89,10 @@ macro_rules! array_impls { } } - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl Eq for [T; $N] { } - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl PartialOrd for [T; $N] { #[inline] fn partial_cmp(&self, other: &[T; $N]) -> Option { @@ -115,7 +116,7 @@ macro_rules! array_impls { } } - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl Ord for [T; $N] { #[inline] fn cmp(&self, other: &[T; $N]) -> Ordering { diff --git a/src/libcore/atomic.rs b/src/libcore/atomic.rs index 18f7fff9053..44b1f2e4560 100644 --- a/src/libcore/atomic.rs +++ b/src/libcore/atomic.rs @@ -68,7 +68,7 @@ //! println!("live tasks: {}", old_task_count + 1); //! ``` -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] use self::Ordering::*; @@ -78,7 +78,7 @@ use intrinsics; use cell::UnsafeCell; /// A boolean type which can be safely shared between threads. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct AtomicBool { v: UnsafeCell, } @@ -86,7 +86,7 @@ pub struct AtomicBool { unsafe impl Sync for AtomicBool {} /// A signed integer type which can be safely shared between threads. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct AtomicIsize { v: UnsafeCell, } @@ -94,7 +94,7 @@ pub struct AtomicIsize { unsafe impl Sync for AtomicIsize {} /// An unsigned integer type which can be safely shared between threads. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct AtomicUsize { v: UnsafeCell, } @@ -102,7 +102,7 @@ pub struct AtomicUsize { unsafe impl Sync for AtomicUsize {} /// A raw pointer type which can be safely shared between threads. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct AtomicPtr { p: UnsafeCell, } @@ -119,42 +119,42 @@ unsafe impl Sync for AtomicPtr {} /// /// Rust's memory orderings are [the same as /// C++'s](http://gcc.gnu.org/wiki/Atomic/GCCMM/AtomicSync). -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] #[derive(Copy)] pub enum Ordering { /// No ordering constraints, only atomic operations. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] Relaxed, /// When coupled with a store, all previous writes become visible /// to another thread that performs a load with `Acquire` ordering /// on the same value. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] Release, /// When coupled with a load, all subsequent loads will see data /// written before a store with `Release` ordering on the same value /// in another thread. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] Acquire, /// When coupled with a load, uses `Acquire` ordering, and with a store /// `Release` ordering. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] AcqRel, /// Like `AcqRel` with the additional guarantee that all threads see all /// sequentially consistent operations in the same order. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] SeqCst, } /// An `AtomicBool` initialized to `false`. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub const ATOMIC_BOOL_INIT: AtomicBool = AtomicBool { v: UnsafeCell { value: 0 } }; /// An `AtomicIsize` initialized to `0`. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub const ATOMIC_ISIZE_INIT: AtomicIsize = AtomicIsize { v: UnsafeCell { value: 0 } }; /// An `AtomicUsize` initialized to `0`. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub const ATOMIC_USIZE_INIT: AtomicUsize = AtomicUsize { v: UnsafeCell { value: 0, } }; @@ -173,7 +173,7 @@ impl AtomicBool { /// let atomic_false = AtomicBool::new(false); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn new(v: bool) -> AtomicBool { let val = if v { UINT_TRUE } else { 0 }; AtomicBool { v: UnsafeCell::new(val) } @@ -197,7 +197,7 @@ impl AtomicBool { /// let value = some_bool.load(Ordering::Relaxed); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn load(&self, order: Ordering) -> bool { unsafe { atomic_load(self.v.get(), order) > 0 } } @@ -220,7 +220,7 @@ impl AtomicBool { /// /// Panics if `order` is `Acquire` or `AcqRel`. #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn store(&self, val: bool, order: Ordering) { let val = if val { UINT_TRUE } else { 0 }; @@ -241,7 +241,7 @@ impl AtomicBool { /// let value = some_bool.swap(false, Ordering::Relaxed); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn swap(&self, val: bool, order: Ordering) -> bool { let val = if val { UINT_TRUE } else { 0 }; @@ -265,7 +265,7 @@ impl AtomicBool { /// let value = some_bool.store(false, Ordering::Relaxed); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn compare_and_swap(&self, old: bool, new: bool, order: Ordering) -> bool { let old = if old { UINT_TRUE } else { 0 }; let new = if new { UINT_TRUE } else { 0 }; @@ -298,7 +298,7 @@ impl AtomicBool { /// assert_eq!(false, foo.load(Ordering::SeqCst)); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn fetch_and(&self, val: bool, order: Ordering) -> bool { let val = if val { UINT_TRUE } else { 0 }; @@ -331,7 +331,7 @@ impl AtomicBool { /// assert_eq!(true, foo.load(Ordering::SeqCst)); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn fetch_nand(&self, val: bool, order: Ordering) -> bool { let val = if val { UINT_TRUE } else { 0 }; @@ -363,7 +363,7 @@ impl AtomicBool { /// assert_eq!(false, foo.load(Ordering::SeqCst)); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn fetch_or(&self, val: bool, order: Ordering) -> bool { let val = if val { UINT_TRUE } else { 0 }; @@ -395,7 +395,7 @@ impl AtomicBool { /// assert_eq!(false, foo.load(Ordering::SeqCst)); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn fetch_xor(&self, val: bool, order: Ordering) -> bool { let val = if val { UINT_TRUE } else { 0 }; @@ -403,7 +403,7 @@ impl AtomicBool { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl AtomicIsize { /// Creates a new `AtomicIsize`. /// @@ -580,7 +580,7 @@ impl AtomicIsize { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl AtomicUsize { /// Creates a new `AtomicUsize`. /// @@ -769,7 +769,7 @@ impl AtomicPtr { /// let atomic_ptr = AtomicPtr::new(ptr); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn new(p: *mut T) -> AtomicPtr { AtomicPtr { p: UnsafeCell::new(p as usize) } } @@ -793,7 +793,7 @@ impl AtomicPtr { /// let value = some_ptr.load(Ordering::Relaxed); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn load(&self, order: Ordering) -> *mut T { unsafe { atomic_load(self.p.get(), order) as *mut T @@ -821,7 +821,7 @@ impl AtomicPtr { /// /// Panics if `order` is `Acquire` or `AcqRel`. #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn store(&self, ptr: *mut T, order: Ordering) { unsafe { atomic_store(self.p.get(), ptr as usize, order); } } @@ -843,7 +843,7 @@ impl AtomicPtr { /// let value = some_ptr.swap(other_ptr, Ordering::Relaxed); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn swap(&self, ptr: *mut T, order: Ordering) -> *mut T { unsafe { atomic_swap(self.p.get(), ptr as usize, order) as *mut T } } @@ -869,7 +869,7 @@ impl AtomicPtr { /// let value = some_ptr.compare_and_swap(other_ptr, another_ptr, Ordering::Relaxed); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn compare_and_swap(&self, old: *mut T, new: *mut T, order: Ordering) -> *mut T { unsafe { atomic_compare_and_swap(self.p.get(), old as usize, @@ -890,7 +890,7 @@ unsafe fn atomic_store(dst: *mut T, val: T, order:Ordering) { } #[inline] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] unsafe fn atomic_load(dst: *const T, order:Ordering) -> T { match order { Acquire => intrinsics::atomic_load_acq(dst), @@ -902,7 +902,7 @@ unsafe fn atomic_load(dst: *const T, order:Ordering) -> T { } #[inline] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] unsafe fn atomic_swap(dst: *mut T, val: T, order: Ordering) -> T { match order { Acquire => intrinsics::atomic_xchg_acq(dst, val), @@ -915,7 +915,7 @@ unsafe fn atomic_swap(dst: *mut T, val: T, order: Ordering) -> T { /// Returns the old value (like __sync_fetch_and_add). #[inline] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] unsafe fn atomic_add(dst: *mut T, val: T, order: Ordering) -> T { match order { Acquire => intrinsics::atomic_xadd_acq(dst, val), @@ -928,7 +928,7 @@ unsafe fn atomic_add(dst: *mut T, val: T, order: Ordering) -> T { /// Returns the old value (like __sync_fetch_and_sub). #[inline] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] unsafe fn atomic_sub(dst: *mut T, val: T, order: Ordering) -> T { match order { Acquire => intrinsics::atomic_xsub_acq(dst, val), @@ -940,7 +940,7 @@ unsafe fn atomic_sub(dst: *mut T, val: T, order: Ordering) -> T { } #[inline] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] unsafe fn atomic_compare_and_swap(dst: *mut T, old:T, new:T, order: Ordering) -> T { match order { Acquire => intrinsics::atomic_cxchg_acq(dst, old, new), @@ -952,7 +952,7 @@ unsafe fn atomic_compare_and_swap(dst: *mut T, old:T, new:T, order: Ordering) } #[inline] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] unsafe fn atomic_and(dst: *mut T, val: T, order: Ordering) -> T { match order { Acquire => intrinsics::atomic_and_acq(dst, val), @@ -964,7 +964,7 @@ unsafe fn atomic_and(dst: *mut T, val: T, order: Ordering) -> T { } #[inline] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] unsafe fn atomic_nand(dst: *mut T, val: T, order: Ordering) -> T { match order { Acquire => intrinsics::atomic_nand_acq(dst, val), @@ -977,7 +977,7 @@ unsafe fn atomic_nand(dst: *mut T, val: T, order: Ordering) -> T { #[inline] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] unsafe fn atomic_or(dst: *mut T, val: T, order: Ordering) -> T { match order { Acquire => intrinsics::atomic_or_acq(dst, val), @@ -990,7 +990,7 @@ unsafe fn atomic_or(dst: *mut T, val: T, order: Ordering) -> T { #[inline] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] unsafe fn atomic_xor(dst: *mut T, val: T, order: Ordering) -> T { match order { Acquire => intrinsics::atomic_xor_acq(dst, val), @@ -1023,7 +1023,7 @@ unsafe fn atomic_xor(dst: *mut T, val: T, order: Ordering) -> T { /// /// Panics if `order` is `Relaxed`. #[inline] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub fn fence(order: Ordering) { unsafe { match order { @@ -1036,7 +1036,8 @@ pub fn fence(order: Ordering) { } } -#[deprecated="renamed to AtomicIsize"] +#[deprecated(feature = "unnamed_feature", since = "1.0.0", + reason = "renamed to AtomicIsize")] #[allow(missing_docs)] pub struct AtomicInt { v: UnsafeCell, @@ -1044,7 +1045,8 @@ pub struct AtomicInt { unsafe impl Sync for AtomicInt {} -#[deprecated="renamed to AtomicUsize"] +#[deprecated(feature = "unnamed_feature", since = "1.0.0", + reason = "renamed to AtomicUsize")] #[allow(missing_docs)] pub struct AtomicUint { v: UnsafeCell, @@ -1052,11 +1054,13 @@ pub struct AtomicUint { unsafe impl Sync for AtomicUint {} -#[deprecated="use ATOMIC_ISIZE_INIT instead"] +#[deprecated(feature = "unnamed_feature", since = "1.0.0", + reason = "use ATOMIC_ISIZE_INIT instead")] #[allow(missing_docs, deprecated)] pub const ATOMIC_INT_INIT: AtomicInt = AtomicInt { v: UnsafeCell { value: 0 } }; -#[deprecated="use ATOMIC_USIZE_INIT instead"] +#[deprecated(feature = "unnamed_feature", since = "1.0.0", + reason = "use ATOMIC_USIZE_INIT instead")] #[allow(missing_docs, deprecated)] pub const ATOMIC_UINT_INIT: AtomicUint = AtomicUint { v: UnsafeCell { value: 0, } }; diff --git a/src/libcore/borrow.rs b/src/libcore/borrow.rs index 4363a0a4441..ef0cf321690 100644 --- a/src/libcore/borrow.rs +++ b/src/libcore/borrow.rs @@ -42,7 +42,8 @@ //! is desired, `to_mut` will obtain a mutable references to an owned //! value, cloning if necessary. -#![unstable = "recently added as part of collections reform"] +#![unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "recently added as part of collections reform")] use clone::Clone; use cmp::{Eq, Ord, Ordering, PartialEq, PartialOrd}; @@ -142,7 +143,7 @@ pub enum Cow<'a, T, B: ?Sized + 'a> where B: ToOwned { Owned(T) } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T, B: ?Sized> Clone for Cow<'a, T, B> where B: ToOwned { fn clone(&self) -> Cow<'a, T, B> { match *self { @@ -196,7 +197,7 @@ impl<'a, T, B: ?Sized> Cow<'a, T, B> where B: ToOwned { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T, B: ?Sized> Deref for Cow<'a, T, B> where B: ToOwned { type Target = B; @@ -208,10 +209,10 @@ impl<'a, T, B: ?Sized> Deref for Cow<'a, T, B> where B: ToOwned { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T, B: ?Sized> Eq for Cow<'a, T, B> where B: Eq + ToOwned {} -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T, B: ?Sized> Ord for Cow<'a, T, B> where B: Ord + ToOwned { #[inline] fn cmp(&self, other: &Cow<'a, T, B>) -> Ordering { @@ -219,7 +220,7 @@ impl<'a, T, B: ?Sized> Ord for Cow<'a, T, B> where B: Ord + ToOwned { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, 'b, T, U, B: ?Sized, C: ?Sized> PartialEq> for Cow<'a, T, B> where B: PartialEq + ToOwned, C: ToOwned, @@ -230,7 +231,7 @@ impl<'a, 'b, T, U, B: ?Sized, C: ?Sized> PartialEq> for Cow<'a, T, } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T, B: ?Sized> PartialOrd for Cow<'a, T, B> where B: PartialOrd + ToOwned { #[inline] fn partial_cmp(&self, other: &Cow<'a, T, B>) -> Option { @@ -238,7 +239,7 @@ impl<'a, T, B: ?Sized> PartialOrd for Cow<'a, T, B> where B: PartialOrd + ToOwne } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T, B: ?Sized> fmt::String for Cow<'a, T, B> where B: fmt::String + ToOwned, T: fmt::String, diff --git a/src/libcore/cell.rs b/src/libcore/cell.rs index 963cb48db07..2cd793a0847 100644 --- a/src/libcore/cell.rs +++ b/src/libcore/cell.rs @@ -154,7 +154,7 @@ // FIXME: Can't be shared between threads. Dynamic borrows // FIXME: Relationship to Atomic types and RWLock -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] use clone::Clone; use cmp::PartialEq; @@ -165,14 +165,14 @@ use option::Option; use option::Option::{None, Some}; /// A mutable memory location that admits only `Copy` data. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Cell { value: UnsafeCell, } impl Cell { /// Creates a new `Cell` containing the given value. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn new(value: T) -> Cell { Cell { value: UnsafeCell::new(value), @@ -181,14 +181,14 @@ impl Cell { /// Returns a copy of the contained value. #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn get(&self) -> T { unsafe{ *self.value.get() } } /// Sets the contained value. #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn set(&self, value: T) { unsafe { *self.value.get() = value; @@ -201,31 +201,31 @@ impl Cell { /// /// This function is `unsafe` because `UnsafeCell`'s field is public. #[inline] - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] pub unsafe fn as_unsafe_cell<'a>(&'a self) -> &'a UnsafeCell { &self.value } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] unsafe impl Send for Cell where T: Send {} -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Clone for Cell { fn clone(&self) -> Cell { Cell::new(self.get()) } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Default for Cell { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn default() -> Cell { Cell::new(Default::default()) } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl PartialEq for Cell { fn eq(&self, other: &Cell) -> bool { self.get() == other.get() @@ -233,7 +233,7 @@ impl PartialEq for Cell { } /// A mutable memory location with dynamically checked borrow rules -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct RefCell { value: UnsafeCell, borrow: Cell, @@ -247,7 +247,7 @@ const WRITING: BorrowFlag = -1; impl RefCell { /// Create a new `RefCell` containing `value` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn new(value: T) -> RefCell { RefCell { value: UnsafeCell::new(value), @@ -256,7 +256,7 @@ impl RefCell { } /// Consumes the `RefCell`, returning the wrapped value. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn into_inner(self) -> T { // Since this function takes `self` (the `RefCell`) by value, the // compiler statically verifies that it is not currently borrowed. @@ -271,7 +271,7 @@ impl RefCell { /// immutable borrows can be taken out at the same time. /// /// Returns `None` if the value is currently mutably borrowed. - #[unstable = "may be renamed or removed"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "may be renamed or removed")] pub fn try_borrow<'a>(&'a self) -> Option> { match BorrowRef::new(&self.borrow) { Some(b) => Some(Ref { _value: unsafe { &*self.value.get() }, _borrow: b }), @@ -287,7 +287,7 @@ impl RefCell { /// # Panics /// /// Panics if the value is currently mutably borrowed. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn borrow<'a>(&'a self) -> Ref<'a, T> { match self.try_borrow() { Some(ptr) => ptr, @@ -301,7 +301,7 @@ impl RefCell { /// cannot be borrowed while this borrow is active. /// /// Returns `None` if the value is currently borrowed. - #[unstable = "may be renamed or removed"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "may be renamed or removed")] pub fn try_borrow_mut<'a>(&'a self) -> Option> { match BorrowRefMut::new(&self.borrow) { Some(b) => Some(RefMut { _value: unsafe { &mut *self.value.get() }, _borrow: b }), @@ -317,7 +317,7 @@ impl RefCell { /// # Panics /// /// Panics if the value is currently borrowed. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn borrow_mut<'a>(&'a self) -> RefMut<'a, T> { match self.try_borrow_mut() { Some(ptr) => ptr, @@ -331,31 +331,31 @@ impl RefCell { /// /// This function is `unsafe` because `UnsafeCell`'s field is public. #[inline] - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] pub unsafe fn as_unsafe_cell<'a>(&'a self) -> &'a UnsafeCell { &self.value } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] unsafe impl Send for RefCell where T: Send {} -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Clone for RefCell { fn clone(&self) -> RefCell { RefCell::new(self.borrow().clone()) } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Default for RefCell { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn default() -> RefCell { RefCell::new(Default::default()) } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl PartialEq for RefCell { fn eq(&self, other: &RefCell) -> bool { *self.borrow() == *other.borrow() @@ -399,7 +399,7 @@ impl<'b> Clone for BorrowRef<'b> { } /// Wraps a borrowed reference to a value in a `RefCell` box. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Ref<'b, T:'b> { // FIXME #12808: strange name to try to avoid interfering with // field accesses of the contained type via Deref @@ -407,7 +407,7 @@ pub struct Ref<'b, T:'b> { _borrow: BorrowRef<'b>, } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'b, T> Deref for Ref<'b, T> { type Target = T; @@ -423,7 +423,8 @@ impl<'b, T> Deref for Ref<'b, T> { /// /// A `Clone` implementation would interfere with the widespread /// use of `r.borrow().clone()` to clone the contents of a `RefCell`. -#[unstable = "likely to be moved to a method, pending language changes"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "likely to be moved to a method, pending language changes")] pub fn clone_ref<'b, T:Clone>(orig: &Ref<'b, T>) -> Ref<'b, T> { Ref { _value: orig._value, @@ -457,7 +458,7 @@ impl<'b> BorrowRefMut<'b> { } /// Wraps a mutable borrowed reference to a value in a `RefCell` box. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct RefMut<'b, T:'b> { // FIXME #12808: strange name to try to avoid interfering with // field accesses of the contained type via Deref @@ -465,7 +466,7 @@ pub struct RefMut<'b, T:'b> { _borrow: BorrowRefMut<'b>, } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'b, T> Deref for RefMut<'b, T> { type Target = T; @@ -475,7 +476,7 @@ impl<'b, T> Deref for RefMut<'b, T> { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'b, T> DerefMut for RefMut<'b, T> { #[inline] fn deref_mut<'a>(&'a mut self) -> &'a mut T { @@ -521,13 +522,13 @@ impl<'b, T> DerefMut for RefMut<'b, T> { /// is not recommended to access its fields directly, `get` should be used /// instead. #[lang="unsafe"] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct UnsafeCell { /// Wrapped value /// /// This field should not be accessed directly, it is made public for static /// initializers. - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] pub value: T, } @@ -537,14 +538,14 @@ impl UnsafeCell { /// /// All access to the inner value through methods is `unsafe`, and it is /// highly discouraged to access the fields directly. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn new(value: T) -> UnsafeCell { UnsafeCell { value: value } } /// Gets a mutable pointer to the wrapped value. #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn get(&self) -> *mut T { &self.value as *const T as *mut T } /// Unwraps the value @@ -552,6 +553,6 @@ impl UnsafeCell { /// This function is unsafe because there is no guarantee that this or other /// tasks are currently inspecting the inner value. #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub unsafe fn into_inner(self) -> T { self.value } } diff --git a/src/libcore/char.rs b/src/libcore/char.rs index caac894c0da..3af9fdef982 100644 --- a/src/libcore/char.rs +++ b/src/libcore/char.rs @@ -64,12 +64,12 @@ static MAX_THREE_B: u32 = 0x10000u32; */ /// The highest valid code point -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub const MAX: char = '\u{10ffff}'; /// Converts from `u32` to a `char` #[inline] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub fn from_u32(i: u32) -> Option { // catch out-of-bounds and surrogates if (i > MAX as u32) || (i >= 0xD800 && i <= 0xDFFF) { @@ -92,7 +92,7 @@ pub fn from_u32(i: u32) -> Option { /// Panics if given an `radix` > 36. /// #[inline] -#[unstable = "pending integer conventions"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "pending integer conventions")] pub fn from_digit(num: uint, radix: uint) -> Option { if radix > 36 { panic!("from_digit: radix is too high (maximum 36)"); @@ -111,7 +111,7 @@ pub fn from_digit(num: uint, radix: uint) -> Option { } /// Basic `char` manipulations. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub trait CharExt { /// Checks if a `char` parses as a numeric digit in the given radix. /// @@ -126,7 +126,8 @@ pub trait CharExt { /// # Panics /// /// Panics if given a radix > 36. - #[unstable = "pending integer conventions"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "pending integer conventions")] fn is_digit(self, radix: uint) -> bool; /// Converts a character to the corresponding digit. @@ -140,7 +141,8 @@ pub trait CharExt { /// # Panics /// /// Panics if given a radix outside the range [0..36]. - #[unstable = "pending integer conventions"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "pending integer conventions")] fn to_digit(self, radix: uint) -> Option; /// Returns an iterator that yields the hexadecimal Unicode escape @@ -149,7 +151,7 @@ pub trait CharExt { /// All characters are escaped with Rust syntax of the form `\\u{NNNN}` /// where `NNNN` is the shortest hexadecimal representation of the code /// point. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn escape_unicode(self) -> EscapeUnicode; /// Returns an iterator that yields the 'default' ASCII and @@ -164,17 +166,17 @@ pub trait CharExt { /// escaped. /// * Any other chars in the range [0x20,0x7e] are not escaped. /// * Any other chars are given hex Unicode escapes; see `escape_unicode`. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn escape_default(self) -> EscapeDefault; /// Returns the amount of bytes this character would need if encoded in /// UTF-8. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn len_utf8(self) -> uint; /// Returns the amount of bytes this character would need if encoded in /// UTF-16. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn len_utf16(self) -> uint; /// Encodes this character as UTF-8 into the provided byte buffer, @@ -182,7 +184,7 @@ pub trait CharExt { /// /// If the buffer is not large enough, nothing will be written into it /// and a `None` will be returned. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn encode_utf8(self, dst: &mut [u8]) -> Option; /// Encodes this character as UTF-16 into the provided `u16` buffer, @@ -190,18 +192,20 @@ pub trait CharExt { /// /// If the buffer is not large enough, nothing will be written into it /// and a `None` will be returned. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn encode_utf16(self, dst: &mut [u16]) -> Option; } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl CharExt for char { - #[unstable = "pending integer conventions"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "pending integer conventions")] fn is_digit(self, radix: uint) -> bool { self.to_digit(radix).is_some() } - #[unstable = "pending integer conventions"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "pending integer conventions")] fn to_digit(self, radix: uint) -> Option { if radix > 36 { panic!("to_digit: radix is too high (maximum 36)"); @@ -216,12 +220,12 @@ impl CharExt for char { else { None } } - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn escape_unicode(self) -> EscapeUnicode { EscapeUnicode { c: self, state: EscapeUnicodeState::Backslash } } - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn escape_default(self) -> EscapeDefault { let init_state = match self { '\t' => EscapeDefaultState::Backslash('t'), @@ -237,7 +241,7 @@ impl CharExt for char { } #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn len_utf8(self) -> uint { let code = self as u32; match () { @@ -249,14 +253,15 @@ impl CharExt for char { } #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn len_utf16(self) -> uint { let ch = self as u32; if (ch & 0xFFFF_u32) == ch { 1 } else { 2 } } #[inline] - #[unstable = "pending decision about Iterator/Writer/Reader"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "pending decision about Iterator/Writer/Reader")] fn encode_utf8(self, dst: &mut [u8]) -> Option { // Marked #[inline] to allow llvm optimizing it away let code = self as u32; @@ -284,7 +289,8 @@ impl CharExt for char { } #[inline] - #[unstable = "pending decision about Iterator/Writer/Reader"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "pending decision about Iterator/Writer/Reader")] fn encode_utf16(self, dst: &mut [u16]) -> Option { // Marked #[inline] to allow llvm optimizing it away let mut ch = self as u32; @@ -307,14 +313,14 @@ impl CharExt for char { /// An iterator over the characters that represent a `char`, as escaped by /// Rust's unicode escaping rules. #[derive(Clone)] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct EscapeUnicode { c: char, state: EscapeUnicodeState } #[derive(Clone)] -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] enum EscapeUnicodeState { Backslash, Type, @@ -324,7 +330,7 @@ enum EscapeUnicodeState { Done, } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Iterator for EscapeUnicode { type Item = char; @@ -370,13 +376,13 @@ impl Iterator for EscapeUnicode { /// An iterator over the characters that represent a `char`, escaped /// for maximum portability. #[derive(Clone)] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct EscapeDefault { state: EscapeDefaultState } #[derive(Clone)] -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] enum EscapeDefaultState { Backslash(char), Char(char), @@ -384,7 +390,7 @@ enum EscapeDefaultState { Unicode(EscapeUnicode), } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Iterator for EscapeDefault { type Item = char; diff --git a/src/libcore/clone.rs b/src/libcore/clone.rs index ffa6d085543..0fbf9438c23 100644 --- a/src/libcore/clone.rs +++ b/src/libcore/clone.rs @@ -19,15 +19,15 @@ //! explicitly, by convention implementing the `Clone` trait and calling //! the `clone` method. -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] use marker::Sized; /// A common trait for cloning an object. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub trait Clone : Sized { /// Returns a copy of the value. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn clone(&self) -> Self; /// Perform copy-assignment from `source`. @@ -36,13 +36,14 @@ pub trait Clone : Sized { /// but can be overridden to reuse the resources of `a` to avoid unnecessary /// allocations. #[inline(always)] - #[unstable = "this function is rarely used"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "this function is rarely used")] fn clone_from(&mut self, source: &Self) { *self = source.clone() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T: ?Sized> Clone for &'a T { /// Return a shallow copy of the reference. #[inline] @@ -51,7 +52,7 @@ impl<'a, T: ?Sized> Clone for &'a T { macro_rules! clone_impl { ($t:ty) => { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl Clone for $t { /// Return a deep copy of the value. #[inline] @@ -81,7 +82,8 @@ clone_impl! { char } macro_rules! extern_fn_clone { ($($A:ident),*) => ( - #[unstable = "this may not be sufficient for fns with region parameters"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "this may not be sufficient for fns with region parameters")] impl<$($A,)* ReturnType> Clone for extern "Rust" fn($($A),*) -> ReturnType { /// Return a copy of a function pointer #[inline] diff --git a/src/libcore/cmp.rs b/src/libcore/cmp.rs index c1f1997df74..1c8ebb0e7c2 100644 --- a/src/libcore/cmp.rs +++ b/src/libcore/cmp.rs @@ -39,7 +39,7 @@ //! assert!(SketchyNum {num: 25} != SketchyNum {num: 57}); //! ``` -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] use self::Ordering::*; @@ -68,16 +68,16 @@ use option::Option::{self, Some, None}; /// the rule that `eq` is a strict inverse of `ne`; that is, `!(a == b)` if and /// only if `a != b`. #[lang="eq"] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] #[old_orphan_check] pub trait PartialEq { /// This method tests for `self` and `other` values to be equal, and is used by `==`. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn eq(&self, other: &Rhs) -> bool; /// This method tests for `!=`. #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn ne(&self, other: &Rhs) -> bool { !self.eq(other) } } @@ -90,7 +90,7 @@ pub trait PartialEq { /// - reflexive: `a == a`; /// - symmetric: `a == b` implies `b == a`; and /// - transitive: `a == b` and `b == c` implies `a == c`. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub trait Eq: PartialEq { // FIXME #13101: this method is used solely by #[deriving] to // assert that every component of a type implements #[deriving] @@ -106,16 +106,16 @@ pub trait Eq: PartialEq { /// An ordering is, e.g, a result of a comparison between two values. #[derive(Clone, Copy, PartialEq, Show)] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub enum Ordering { /// An ordering where a compared value is less [than another]. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] Less = -1i, /// An ordering where a compared value is equal [to another]. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] Equal = 0i, /// An ordering where a compared value is greater [than another]. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] Greater = 1i, } @@ -141,7 +141,7 @@ impl Ordering { /// assert!(data == b); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn reverse(self) -> Ordering { unsafe { // this compiles really nicely (to a single instruction); @@ -164,7 +164,7 @@ impl Ordering { /// true; and /// - transitive, `a < b` and `b < c` implies `a < c`. The same must hold for /// both `==` and `>`. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub trait Ord: Eq + PartialOrd { /// This method returns an ordering between `self` and `other` values. /// @@ -178,26 +178,26 @@ pub trait Ord: Eq + PartialOrd { /// assert_eq!(10u.cmp(&5), Greater); // because 10 > 5 /// assert_eq!( 5u.cmp(&5), Equal); // because 5 == 5 /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn cmp(&self, other: &Self) -> Ordering; } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Eq for Ordering {} -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Ord for Ordering { #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn cmp(&self, other: &Ordering) -> Ordering { (*self as int).cmp(&(*other as int)) } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl PartialOrd for Ordering { #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn partial_cmp(&self, other: &Ordering) -> Option { (*self as int).partial_cmp(&(*other as int)) } @@ -224,16 +224,16 @@ impl PartialOrd for Ordering { /// `NaN < 0 == false` and `NaN >= 0 == false` (cf. IEEE 754-2008 section /// 5.11). #[lang="ord"] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub trait PartialOrd: PartialEq { /// This method returns an ordering between `self` and `other` values /// if one exists. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn partial_cmp(&self, other: &Rhs) -> Option; /// This method tests less than (for `self` and `other`) and is used by the `<` operator. #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn lt(&self, other: &Rhs) -> bool { match self.partial_cmp(other) { Some(Less) => true, @@ -243,7 +243,7 @@ pub trait PartialOrd: PartialEq { /// This method tests less than or equal to (`<=`). #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn le(&self, other: &Rhs) -> bool { match self.partial_cmp(other) { Some(Less) | Some(Equal) => true, @@ -253,7 +253,7 @@ pub trait PartialOrd: PartialEq { /// This method tests greater than (`>`). #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn gt(&self, other: &Rhs) -> bool { match self.partial_cmp(other) { Some(Greater) => true, @@ -263,7 +263,7 @@ pub trait PartialOrd: PartialEq { /// This method tests greater than or equal to (`>=`). #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn ge(&self, other: &Rhs) -> bool { match self.partial_cmp(other) { Some(Greater) | Some(Equal) => true, @@ -274,14 +274,14 @@ pub trait PartialOrd: PartialEq { /// Compare and return the minimum of two values. #[inline] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub fn min(v1: T, v2: T) -> T { if v1 < v2 { v1 } else { v2 } } /// Compare and return the maximum of two values. #[inline] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub fn max(v1: T, v2: T) -> T { if v1 > v2 { v1 } else { v2 } } @@ -290,7 +290,7 @@ pub fn max(v1: T, v2: T) -> T { /// /// Returns the first argument if the comparison determines them to be equal. #[inline] -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn partial_min(v1: T, v2: T) -> Option { match v1.partial_cmp(&v2) { Some(Less) | Some(Equal) => Some(v1), @@ -303,7 +303,7 @@ pub fn partial_min(v1: T, v2: T) -> Option { /// /// Returns the first argument if the comparison determines them to be equal. #[inline] -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn partial_max(v1: T, v2: T) -> Option { match v1.partial_cmp(&v2) { Some(Less) => Some(v2), @@ -322,7 +322,7 @@ mod impls { macro_rules! partial_eq_impl { ($($t:ty)*) => ($( - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl PartialEq for $t { #[inline] fn eq(&self, other: &$t) -> bool { (*self) == (*other) } @@ -332,7 +332,7 @@ mod impls { )*) } - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl PartialEq for () { #[inline] fn eq(&self, _other: &()) -> bool { true } @@ -346,7 +346,7 @@ mod impls { macro_rules! eq_impl { ($($t:ty)*) => ($( - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl Eq for $t {} )*) } @@ -355,7 +355,7 @@ mod impls { macro_rules! partial_ord_impl { ($($t:ty)*) => ($( - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl PartialOrd for $t { #[inline] fn partial_cmp(&self, other: &$t) -> Option { @@ -378,7 +378,7 @@ mod impls { )*) } - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl PartialOrd for () { #[inline] fn partial_cmp(&self, _: &()) -> Option { @@ -386,7 +386,7 @@ mod impls { } } - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl PartialOrd for bool { #[inline] fn partial_cmp(&self, other: &bool) -> Option { @@ -398,7 +398,7 @@ mod impls { macro_rules! ord_impl { ($($t:ty)*) => ($( - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl Ord for $t { #[inline] fn cmp(&self, other: &$t) -> Ordering { @@ -410,13 +410,13 @@ mod impls { )*) } - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl Ord for () { #[inline] fn cmp(&self, _other: &()) -> Ordering { Equal } } - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl Ord for bool { #[inline] fn cmp(&self, other: &bool) -> Ordering { @@ -428,14 +428,14 @@ mod impls { // & pointers - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, 'b, A: ?Sized, B: ?Sized> PartialEq<&'b B> for &'a A where A: PartialEq { #[inline] fn eq(&self, other: & &'b B) -> bool { PartialEq::eq(*self, *other) } #[inline] fn ne(&self, other: & &'b B) -> bool { PartialEq::ne(*self, *other) } } - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, 'b, A: ?Sized, B: ?Sized> PartialOrd<&'b B> for &'a A where A: PartialOrd { #[inline] fn partial_cmp(&self, other: &&'b B) -> Option { @@ -450,24 +450,24 @@ mod impls { #[inline] fn gt(&self, other: & &'b B) -> bool { PartialOrd::gt(*self, *other) } } - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, A: ?Sized> Ord for &'a A where A: Ord { #[inline] fn cmp(&self, other: & &'a A) -> Ordering { Ord::cmp(*self, *other) } } - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, A: ?Sized> Eq for &'a A where A: Eq {} // &mut pointers - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, 'b, A: ?Sized, B: ?Sized> PartialEq<&'b mut B> for &'a mut A where A: PartialEq { #[inline] fn eq(&self, other: &&'b mut B) -> bool { PartialEq::eq(*self, *other) } #[inline] fn ne(&self, other: &&'b mut B) -> bool { PartialEq::ne(*self, *other) } } - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, 'b, A: ?Sized, B: ?Sized> PartialOrd<&'b mut B> for &'a mut A where A: PartialOrd { #[inline] fn partial_cmp(&self, other: &&'b mut B) -> Option { @@ -482,15 +482,15 @@ mod impls { #[inline] fn gt(&self, other: &&'b mut B) -> bool { PartialOrd::gt(*self, *other) } } - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, A: ?Sized> Ord for &'a mut A where A: Ord { #[inline] fn cmp(&self, other: &&'a mut A) -> Ordering { Ord::cmp(*self, *other) } } - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, A: ?Sized> Eq for &'a mut A where A: Eq {} - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, 'b, A: ?Sized, B: ?Sized> PartialEq<&'b mut B> for &'a A where A: PartialEq { #[inline] fn eq(&self, other: &&'b mut B) -> bool { PartialEq::eq(*self, *other) } @@ -498,7 +498,7 @@ mod impls { fn ne(&self, other: &&'b mut B) -> bool { PartialEq::ne(*self, *other) } } - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, 'b, A: ?Sized, B: ?Sized> PartialEq<&'b B> for &'a mut A where A: PartialEq { #[inline] fn eq(&self, other: &&'b B) -> bool { PartialEq::eq(*self, *other) } diff --git a/src/libcore/default.rs b/src/libcore/default.rs index 8d4ecf72243..74cb062af23 100644 --- a/src/libcore/default.rs +++ b/src/libcore/default.rs @@ -81,7 +81,7 @@ //! } //! ``` -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] /// A trait that types which have a useful default value should implement. /// @@ -97,7 +97,7 @@ /// bar: f32, /// } /// ``` -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub trait Default { /// Returns the "default value" for a type. /// @@ -131,16 +131,16 @@ pub trait Default { /// fn default() -> Kind { Kind::A } /// } /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn default() -> Self; } macro_rules! default_impl { ($t:ty, $v:expr) => { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl Default for $t { #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn default() -> $t { $v } } } diff --git a/src/libcore/finally.rs b/src/libcore/finally.rs index ed3612bded0..fdc659a300b 100644 --- a/src/libcore/finally.rs +++ b/src/libcore/finally.rs @@ -30,10 +30,11 @@ //! }) //! ``` -#![deprecated = "It is unclear if this module is more robust than implementing \ - Drop on a custom type, and this module is being removed with no \ - replacement. Use a custom Drop implementation to regain existing \ - functionality."] +#![deprecated(feature = "unnamed_feature", since = "1.0.0", + reason = "It is unclear if this module is more robust than implementing \ + Drop on a custom type, and this module is being removed with no \ + replacement. Use a custom Drop implementation to regain existing \ + functionality.")] #![allow(deprecated)] use ops::{Drop, FnMut, FnOnce}; diff --git a/src/libcore/fmt/mod.rs b/src/libcore/fmt/mod.rs index 535722f93bf..bd45f742b60 100644 --- a/src/libcore/fmt/mod.rs +++ b/src/libcore/fmt/mod.rs @@ -11,7 +11,7 @@ //! Utilities for formatting and printing strings #![allow(unused_variables)] -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] use any; use cell::{Cell, RefCell, Ref, RefMut}; @@ -36,7 +36,8 @@ mod num; mod float; pub mod rt; -#[unstable = "core and I/O reconciliation may alter this definition"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "core and I/O reconciliation may alter this definition")] /// The type returned by formatter methods. pub type Result = result::Result<(), Error>; @@ -45,7 +46,8 @@ pub type Result = result::Result<(), Error>; /// This type does not support transmission of an error other than that an error /// occurred. Any extra information must be arranged to be transmitted through /// some other means. -#[unstable = "core and I/O reconciliation may alter this definition"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "core and I/O reconciliation may alter this definition")] #[derive(Copy)] pub struct Error; @@ -58,7 +60,8 @@ pub struct Error; /// This trait should generally not be implemented by consumers of the standard /// library. The `write!` macro accepts an instance of `io::Writer`, and the /// `io::Writer` trait is favored over implementing this trait. -#[unstable = "waiting for core and I/O reconciliation"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "waiting for core and I/O reconciliation")] pub trait Writer { /// Writes a slice of bytes into this writer, returning whether the write /// succeeded. @@ -101,7 +104,8 @@ pub trait Writer { /// A struct to represent both where to emit formatting strings to and how they /// should be formatted. A mutable version of this is passed to all formatting /// traits. -#[unstable = "name may change and implemented traits are also unstable"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "name may change and implemented traits are also unstable")] pub struct Formatter<'a> { flags: uint, fill: char, @@ -123,7 +127,8 @@ enum Void {} /// family of functions. It contains a function to format the given value. At /// compile time it is ensured that the function and the value have the correct /// types, and then this struct is used to canonicalize arguments to one type. -#[unstable = "implementation detail of the `format_args!` macro"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "implementation detail of the `format_args!` macro")] #[derive(Copy)] pub struct Argument<'a> { value: &'a Void, @@ -162,7 +167,8 @@ impl<'a> Arguments<'a> { /// When using the format_args!() macro, this function is used to generate the /// Arguments structure. #[doc(hidden)] #[inline] - #[unstable = "implementation detail of the `format_args!` macro"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "implementation detail of the `format_args!` macro")] pub fn new(pieces: &'a [&'a str], args: &'a [Argument<'a>]) -> Arguments<'a> { Arguments { @@ -179,7 +185,8 @@ impl<'a> Arguments<'a> { /// created with `argumentuint`. However, failing to do so doesn't cause /// unsafety, but will ignore invalid . #[doc(hidden)] #[inline] - #[unstable = "implementation detail of the `format_args!` macro"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "implementation detail of the `format_args!` macro")] pub fn with_placeholders(pieces: &'a [&'a str], fmt: &'a [rt::Argument], args: &'a [Argument<'a>]) -> Arguments<'a> { @@ -200,7 +207,7 @@ impl<'a> Arguments<'a> { /// and pass it to a function or closure, passed as the first argument. The /// macro validates the format string at compile-time so usage of the `write` /// and `format` functions can be safely performed. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] #[derive(Copy)] pub struct Arguments<'a> { // Format string pieces to print. @@ -220,7 +227,7 @@ impl<'a> Show for Arguments<'a> { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a> String for Arguments<'a> { fn fmt(&self, fmt: &mut Formatter) -> Result { write(fmt.buf, *self) @@ -229,7 +236,8 @@ impl<'a> String for Arguments<'a> { /// Format trait for the `:?` format. Useful for debugging, most all types /// should implement this. -#[unstable = "I/O and core have yet to be reconciled"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "I/O and core have yet to be reconciled")] pub trait Show { /// Formats the value using the given formatter. fn fmt(&self, &mut Formatter) -> Result; @@ -237,7 +245,8 @@ pub trait Show { /// When a value can be semantically expressed as a String, this trait may be /// used. It corresponds to the default format, `{}`. -#[unstable = "I/O and core have yet to be reconciled"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "I/O and core have yet to be reconciled")] pub trait String { /// Formats the value using the given formatter. fn fmt(&self, &mut Formatter) -> Result; @@ -245,49 +254,56 @@ pub trait String { /// Format trait for the `o` character -#[unstable = "I/O and core have yet to be reconciled"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "I/O and core have yet to be reconciled")] pub trait Octal { /// Formats the value using the given formatter. fn fmt(&self, &mut Formatter) -> Result; } /// Format trait for the `b` character -#[unstable = "I/O and core have yet to be reconciled"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "I/O and core have yet to be reconciled")] pub trait Binary { /// Formats the value using the given formatter. fn fmt(&self, &mut Formatter) -> Result; } /// Format trait for the `x` character -#[unstable = "I/O and core have yet to be reconciled"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "I/O and core have yet to be reconciled")] pub trait LowerHex { /// Formats the value using the given formatter. fn fmt(&self, &mut Formatter) -> Result; } /// Format trait for the `X` character -#[unstable = "I/O and core have yet to be reconciled"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "I/O and core have yet to be reconciled")] pub trait UpperHex { /// Formats the value using the given formatter. fn fmt(&self, &mut Formatter) -> Result; } /// Format trait for the `p` character -#[unstable = "I/O and core have yet to be reconciled"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "I/O and core have yet to be reconciled")] pub trait Pointer { /// Formats the value using the given formatter. fn fmt(&self, &mut Formatter) -> Result; } /// Format trait for the `e` character -#[unstable = "I/O and core have yet to be reconciled"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "I/O and core have yet to be reconciled")] pub trait LowerExp { /// Formats the value using the given formatter. fn fmt(&self, &mut Formatter) -> Result; } /// Format trait for the `E` character -#[unstable = "I/O and core have yet to be reconciled"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "I/O and core have yet to be reconciled")] pub trait UpperExp { /// Formats the value using the given formatter. fn fmt(&self, &mut Formatter) -> Result; @@ -301,8 +317,9 @@ pub trait UpperExp { /// /// * output - the buffer to write output to /// * args - the precompiled arguments generated by `format_args!` -#[unstable = "libcore and I/O have yet to be reconciled, and this is an \ - implementation detail which should not otherwise be exported"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "libcore and I/O have yet to be reconciled, and this is an \ + implementation detail which should not otherwise be exported")] pub fn write(output: &mut Writer, args: Arguments) -> Result { let mut formatter = Formatter { flags: 0, @@ -398,7 +415,8 @@ impl<'a> Formatter<'a> { /// /// This function will correctly account for the flags provided as well as /// the minimum width. It will not take precision into account. - #[unstable = "definition may change slightly over time"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "definition may change slightly over time")] pub fn pad_integral(&mut self, is_positive: bool, prefix: &str, @@ -474,7 +492,8 @@ impl<'a> Formatter<'a> { /// is longer than this length /// /// Notably this function ignored the `flag` parameters - #[unstable = "definition may change slightly over time"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "definition may change slightly over time")] pub fn pad(&mut self, s: &str) -> Result { // Make sure there's a fast path up front if self.width.is_none() && self.precision.is_none() { @@ -551,35 +570,38 @@ impl<'a> Formatter<'a> { /// Writes some data to the underlying buffer contained within this /// formatter. - #[unstable = "reconciling core and I/O may alter this definition"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "reconciling core and I/O may alter this definition")] pub fn write_str(&mut self, data: &str) -> Result { self.buf.write_str(data) } /// Writes some formatted information into this instance - #[unstable = "reconciling core and I/O may alter this definition"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "reconciling core and I/O may alter this definition")] pub fn write_fmt(&mut self, fmt: Arguments) -> Result { write(self.buf, fmt) } /// Flags for formatting (packed version of rt::Flag) - #[unstable = "return type may change and method was just created"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "return type may change and method was just created")] pub fn flags(&self) -> uint { self.flags } /// Character used as 'fill' whenever there is alignment - #[unstable = "method was just created"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "method was just created")] pub fn fill(&self) -> char { self.fill } /// Flag indicating what form of alignment was requested - #[unstable = "method was just created"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "method was just created")] pub fn align(&self) -> rt::Alignment { self.align } /// Optionally specified integer width that the output should be - #[unstable = "method was just created"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "method was just created")] pub fn width(&self) -> Option { self.width } /// Optionally specified precision for numeric types - #[unstable = "method was just created"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "method was just created")] pub fn precision(&self) -> Option { self.precision } } @@ -592,7 +614,8 @@ impl Show for Error { /// This is a function which calls are emitted to by the compiler itself to /// create the Argument structures that are passed into the `format` function. #[doc(hidden)] #[inline] -#[unstable = "implementation detail of the `format_args!` macro"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "implementation detail of the `format_args!` macro")] pub fn argument<'a, T>(f: fn(&T, &mut Formatter) -> Result, t: &'a T) -> Argument<'a> { Argument::new(t, f) @@ -601,7 +624,8 @@ pub fn argument<'a, T>(f: fn(&T, &mut Formatter) -> Result, /// When the compiler determines that the type of an argument *must* be a uint /// (such as for width and precision), then it invokes this method. #[doc(hidden)] #[inline] -#[unstable = "implementation detail of the `format_args!` macro"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "implementation detail of the `format_args!` macro")] pub fn argumentuint<'a>(s: &'a uint) -> Argument<'a> { Argument::from_uint(s) } @@ -629,7 +653,7 @@ impl Show for bool { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl String for bool { fn fmt(&self, f: &mut Formatter) -> Result { String::fmt(if *self { "true" } else { "false" }, f) @@ -646,7 +670,7 @@ impl Show for str { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl String for str { fn fmt(&self, f: &mut Formatter) -> Result { f.pad(self) @@ -664,7 +688,7 @@ impl Show for char { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl String for char { fn fmt(&self, f: &mut Formatter) -> Result { let mut utf8 = [0u8; 4]; @@ -710,7 +734,7 @@ macro_rules! floating { ($ty:ident) => { } } - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl String for $ty { fn fmt(&self, fmt: &mut Formatter) -> Result { use num::Float; @@ -855,7 +879,7 @@ impl Show for Cell { } } -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] impl Show for RefCell { fn fmt(&self, f: &mut Formatter) -> Result { match self.try_borrow() { @@ -877,7 +901,7 @@ impl<'b, T: Show> Show for RefMut<'b, T> { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl String for Utf8Error { fn fmt(&self, f: &mut Formatter) -> Result { match *self { diff --git a/src/libcore/fmt/num.rs b/src/libcore/fmt/num.rs index 1df6f845225..630b7489eba 100644 --- a/src/libcore/fmt/num.rs +++ b/src/libcore/fmt/num.rs @@ -111,7 +111,8 @@ radix! { UpperHex, 16, "0x", x @ 0 ... 9 => b'0' + x, /// A radix with in the range of `2..36`. #[derive(Clone, Copy, PartialEq)] -#[unstable = "may be renamed or move to a different module"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "may be renamed or move to a different module")] pub struct Radix { base: u8, } @@ -135,7 +136,8 @@ impl GenericRadix for Radix { } /// A helper type for formatting radixes. -#[unstable = "may be renamed or move to a different module"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "may be renamed or move to a different module")] #[derive(Copy)] pub struct RadixFmt(T, R); @@ -147,7 +149,8 @@ pub struct RadixFmt(T, R); /// use std::fmt::radix; /// assert_eq!(format!("{}", radix(55i, 36)), "1j".to_string()); /// ``` -#[unstable = "may be renamed or move to a different module"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "may be renamed or move to a different module")] pub fn radix(x: T, base: u8) -> RadixFmt { RadixFmt(x, Radix::new(base)) } diff --git a/src/libcore/fmt/rt.rs b/src/libcore/fmt/rt.rs index bea32219155..6056a8858b7 100644 --- a/src/libcore/fmt/rt.rs +++ b/src/libcore/fmt/rt.rs @@ -14,7 +14,8 @@ //! These definitions are similar to their `ct` equivalents, but differ in that //! these can be statically allocated and are slightly optimized for the runtime -#![unstable = "implementation detail of the `format_args!` macro"] +#![unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "implementation detail of the `format_args!` macro")] pub use self::Alignment::*; pub use self::Count::*; diff --git a/src/libcore/hash/mod.rs b/src/libcore/hash/mod.rs index 742e6239017..51212bcdb68 100644 --- a/src/libcore/hash/mod.rs +++ b/src/libcore/hash/mod.rs @@ -56,7 +56,8 @@ //! assert_eq!(hash::<_, SipHasher>(&person1), hash::<_, SipHasher>(&person2)); //! ``` -#![unstable = "module was recently redesigned"] +#![unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "module was recently redesigned")] use prelude::*; diff --git a/src/libcore/hash/sip.rs b/src/libcore/hash/sip.rs index c20fb8457d2..1492547de44 100644 --- a/src/libcore/hash/sip.rs +++ b/src/libcore/hash/sip.rs @@ -112,7 +112,7 @@ impl SipHasher { } /// Returns the computed hash. - #[deprecated = "renamed to finish"] + #[deprecated(feature = "oldstuff", since = "1.0.0", reason = "renamed to finish")] pub fn result(&self) -> u64 { self.finish() } } diff --git a/src/libcore/intrinsics.rs b/src/libcore/intrinsics.rs index 73be68289c9..5835449e946 100644 --- a/src/libcore/intrinsics.rs +++ b/src/libcore/intrinsics.rs @@ -39,7 +39,7 @@ //! guaranteed to happen in order. This is the standard mode for working //! with atomic types and is equivalent to Java's `volatile`. -#![unstable] +#![unstable(feature = "unnamed_feature", since = "1.0.0")] #![allow(missing_docs)] use marker::Sized; @@ -227,7 +227,7 @@ extern "rust-intrinsic" { /// /// `forget` is unsafe because the caller is responsible for /// ensuring the argument is deallocated already. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn forget(_: T) -> (); /// Unsafely transforms a value of one type into a value of another type. @@ -243,7 +243,7 @@ extern "rust-intrinsic" { /// let v: &[u8] = unsafe { mem::transmute("L") }; /// assert!(v == [76u8]); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn transmute(e: T) -> U; /// Gives the address for the return value of the enclosing function. @@ -303,7 +303,7 @@ extern "rust-intrinsic" { /// } /// } /// ``` - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn copy_nonoverlapping_memory(dst: *mut T, src: *const T, count: uint); /// Copies `count * size_of` bytes from `src` to `dst`. The source @@ -333,12 +333,13 @@ extern "rust-intrinsic" { /// } /// ``` /// - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn copy_memory(dst: *mut T, src: *const T, count: uint); /// Invokes memset on the specified pointer, setting `count * size_of::()` /// bytes of memory starting at `dst` to `c`. - #[unstable = "uncertain about naming and semantics"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "uncertain about naming and semantics")] pub fn set_memory(dst: *mut T, val: u8, count: uint); /// Equivalent to the appropriate `llvm.memcpy.p0i8.0i8.*` intrinsic, with diff --git a/src/libcore/iter.rs b/src/libcore/iter.rs index 0005db36c27..9dc13a58311 100644 --- a/src/libcore/iter.rs +++ b/src/libcore/iter.rs @@ -54,7 +54,7 @@ //! //! This `for` loop syntax can be applied to any iterator over any type. -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] use self::MinMaxResult::*; @@ -81,13 +81,13 @@ use uint; /// it wishes, either by returning `None` infinitely, or by doing something /// else. #[lang="iterator"] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub trait Iterator { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] type Item; /// Advance the iterator and return the next value. Return `None` when the end is reached. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn next(&mut self) -> Option; /// Returns a lower and upper bound on the remaining length of the iterator. @@ -95,12 +95,12 @@ pub trait Iterator { /// An upper bound of `None` means either there is no known upper bound, or the upper bound /// does not fit within a `uint`. #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn size_hint(&self) -> (uint, Option) { (0, None) } } /// Conversion from an `Iterator` -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] #[rustc_on_unimplemented="a collection of type `{Self}` cannot be \ built from an iterator over elements of type `{A}`"] pub trait FromIterator { @@ -109,15 +109,15 @@ pub trait FromIterator { } /// A type growable from an `Iterator` implementation -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub trait Extend { /// Extend a container with the elements yielded by an arbitrary iterator - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn extend>(&mut self, iterator: T); } /// An extension trait providing numerous methods applicable to all iterators. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub trait IteratorExt: Iterator + Sized { /// Counts the number of elements in this iterator. /// @@ -129,7 +129,7 @@ pub trait IteratorExt: Iterator + Sized { /// assert!(it.count() == 5); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn count(self) -> uint { self.fold(0, |cnt, _x| cnt + 1) } @@ -144,7 +144,7 @@ pub trait IteratorExt: Iterator + Sized { /// assert!(a.iter().last().unwrap() == &5); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn last(mut self) -> Option { let mut last = None; for x in self { last = Some(x); } @@ -163,7 +163,7 @@ pub trait IteratorExt: Iterator + Sized { /// assert!(it.nth(2) == None); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn nth(&mut self, mut n: uint) -> Option { for x in *self { if n == 0 { return Some(x) } @@ -187,7 +187,7 @@ pub trait IteratorExt: Iterator + Sized { /// assert!(it.next().is_none()); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn chain(self, other: U) -> Chain where U: Iterator, { @@ -210,7 +210,7 @@ pub trait IteratorExt: Iterator + Sized { /// assert!(it.next().is_none()); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn zip(self, other: U) -> Zip where U: Iterator, { @@ -230,7 +230,7 @@ pub trait IteratorExt: Iterator + Sized { /// assert!(it.next().is_none()); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn map(self, f: F) -> Map where F: FnMut(Self::Item) -> B, { @@ -250,7 +250,7 @@ pub trait IteratorExt: Iterator + Sized { /// assert!(it.next().is_none()); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn filter

(self, predicate: P) -> Filter where P: FnMut(&Self::Item) -> bool, { @@ -270,7 +270,7 @@ pub trait IteratorExt: Iterator + Sized { /// assert!(it.next().is_none()); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn filter_map(self, f: F) -> FilterMap where F: FnMut(Self::Item) -> Option, { @@ -291,7 +291,7 @@ pub trait IteratorExt: Iterator + Sized { /// assert!(it.next().is_none()); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn enumerate(self) -> Enumerate { Enumerate{iter: self, count: 0} } @@ -314,7 +314,7 @@ pub trait IteratorExt: Iterator + Sized { /// assert!(it.next().is_none()); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn peekable(self) -> Peekable { Peekable{iter: self, peeked: None} } @@ -334,7 +334,7 @@ pub trait IteratorExt: Iterator + Sized { /// assert!(it.next().is_none()); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn skip_while

(self, predicate: P) -> SkipWhile where P: FnMut(&Self::Item) -> bool, { @@ -355,7 +355,7 @@ pub trait IteratorExt: Iterator + Sized { /// assert!(it.next().is_none()); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn take_while

(self, predicate: P) -> TakeWhile where P: FnMut(&Self::Item) -> bool, { @@ -375,7 +375,7 @@ pub trait IteratorExt: Iterator + Sized { /// assert!(it.next().is_none()); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn skip(self, n: uint) -> Skip { Skip{iter: self, n: n} } @@ -394,7 +394,7 @@ pub trait IteratorExt: Iterator + Sized { /// assert!(it.next().is_none()); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn take(self, n: uint) -> Take { Take{iter: self, n: n} } @@ -420,7 +420,7 @@ pub trait IteratorExt: Iterator + Sized { /// assert!(it.next().is_none()); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn scan( self, initial_state: St, @@ -450,7 +450,7 @@ pub trait IteratorExt: Iterator + Sized { /// } /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn flat_map(self, f: F) -> FlatMap where U: Iterator, F: FnMut(Self::Item) -> U, @@ -486,7 +486,7 @@ pub trait IteratorExt: Iterator + Sized { /// assert_eq!(process(x.into_iter()), 1006); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn fuse(self) -> Fuse { Fuse{iter: self, done: false} } @@ -510,7 +510,7 @@ pub trait IteratorExt: Iterator + Sized { /// println!("{}", sum); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn inspect(self, f: F) -> Inspect where F: FnMut(&Self::Item), { @@ -532,7 +532,7 @@ pub trait IteratorExt: Iterator + Sized { /// // xs.next() is now `5` /// assert!(xs.next() == Some(5)); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn by_ref<'r>(&'r mut self) -> ByRef<'r, Self> { ByRef{iter: self} } @@ -548,7 +548,7 @@ pub trait IteratorExt: Iterator + Sized { /// assert!(a.as_slice() == b.as_slice()); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn collect>(self) -> B { FromIterator::from_iter(self) } @@ -564,7 +564,8 @@ pub trait IteratorExt: Iterator + Sized { /// assert_eq!(even, vec![2, 4]); /// assert_eq!(odd, vec![1, 3]); /// ``` - #[unstable = "recently added as part of collections reform"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "recently added as part of collections reform")] fn partition(mut self, mut f: F) -> (B, B) where B: Default + Extend, F: FnMut(&Self::Item) -> bool @@ -593,7 +594,7 @@ pub trait IteratorExt: Iterator + Sized { /// assert!(a.iter().fold(0, |a, &b| a + b) == 15); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn fold(mut self, init: B, mut f: F) -> B where F: FnMut(B, Self::Item) -> B, { @@ -614,7 +615,7 @@ pub trait IteratorExt: Iterator + Sized { /// assert!(!a.iter().all(|x| *x > 2)); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn all(mut self, mut f: F) -> bool where F: FnMut(Self::Item) -> bool { for x in self { if !f(x) { return false; } } true @@ -632,7 +633,7 @@ pub trait IteratorExt: Iterator + Sized { /// assert!(!it.any(|x| *x == 3)); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn any(&mut self, mut f: F) -> bool where F: FnMut(Self::Item) -> bool { for x in *self { if f(x) { return true; } } false @@ -642,7 +643,7 @@ pub trait IteratorExt: Iterator + Sized { /// /// Does not consume the iterator past the first found element. #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn find

(&mut self, mut predicate: P) -> Option where P: FnMut(&Self::Item) -> bool, { @@ -654,7 +655,7 @@ pub trait IteratorExt: Iterator + Sized { /// Return the index of the first element satisfying the specified predicate #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn position

(&mut self, mut predicate: P) -> Option where P: FnMut(Self::Item) -> bool, { @@ -672,7 +673,7 @@ pub trait IteratorExt: Iterator + Sized { /// /// If no element matches, None is returned. #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn rposition

(&mut self, mut predicate: P) -> Option where P: FnMut(Self::Item) -> bool, Self: ExactSizeIterator + DoubleEndedIterator @@ -695,7 +696,7 @@ pub trait IteratorExt: Iterator + Sized { /// assert!(a.iter().max().unwrap() == &5); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn max(self) -> Option where Self::Item: Ord { self.fold(None, |max, x| { @@ -715,7 +716,7 @@ pub trait IteratorExt: Iterator + Sized { /// assert!(a.iter().min().unwrap() == &1); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn min(self) -> Option where Self::Item: Ord { self.fold(None, |min, x| { @@ -759,7 +760,7 @@ pub trait IteratorExt: Iterator + Sized { /// let v = [1i, 1, 1, 1]; /// assert!(v.iter().min_max() == MinMax(&1, &1)); /// ``` - #[unstable = "return type may change"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "return type may change")] fn min_max(mut self) -> MinMaxResult where Self::Item: Ord { let (mut min, mut max) = match self.next() { @@ -816,7 +817,8 @@ pub trait IteratorExt: Iterator + Sized { /// assert_eq!(*xs.iter().max_by(|x| x.abs()).unwrap(), -10); /// ``` #[inline] - #[unstable = "may want to produce an Ordering directly; see #15311"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "may want to produce an Ordering directly; see #15311")] fn max_by(self, mut f: F) -> Option where F: FnMut(&Self::Item) -> B, { @@ -845,7 +847,8 @@ pub trait IteratorExt: Iterator + Sized { /// assert_eq!(*xs.iter().min_by(|x| x.abs()).unwrap(), 0); /// ``` #[inline] - #[unstable = "may want to produce an Ordering directly; see #15311"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "may want to produce an Ordering directly; see #15311")] fn min_by(self, mut f: F) -> Option where F: FnMut(&Self::Item) -> B, { @@ -875,7 +878,7 @@ pub trait IteratorExt: Iterator + Sized { /// Note: Random access with flipped indices still only applies to the first /// `uint::MAX` elements of the original iterator. #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn rev(self) -> Rev { Rev{iter: self} } @@ -884,7 +887,7 @@ pub trait IteratorExt: Iterator + Sized { /// /// Loops through the entire iterator, collecting the first component of /// each item into one new container, and the second component into another. - #[unstable = "recent addition"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "recent addition")] fn unzip(mut self) -> (FromA, FromB) where FromA: Default + Extend, FromB: Default + Extend, @@ -917,7 +920,7 @@ pub trait IteratorExt: Iterator + Sized { /// Creates an iterator that clones the elements it yields. Useful for converting an /// Iterator<&T> to an Iterator. - #[unstable = "recent addition"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "recent addition")] fn cloned(self) -> Cloned where Self: Iterator, D: Deref, @@ -938,14 +941,15 @@ pub trait IteratorExt: Iterator + Sized { /// assert_eq!(cy.next(), Some(1)); /// assert_eq!(cy.next(), Some(1)); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] #[inline] fn cycle(self) -> Cycle where Self: Clone { Cycle{orig: self.clone(), iter: self} } /// Use an iterator to reverse a container in place. - #[unstable = "uncertain about placement or widespread use"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "uncertain about placement or widespread use")] fn reverse_in_place<'a, T: 'a>(&mut self) where Self: Iterator + DoubleEndedIterator { @@ -958,17 +962,17 @@ pub trait IteratorExt: Iterator + Sized { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl IteratorExt for I where I: Iterator {} /// A range iterator able to yield elements from both ends /// /// A `DoubleEndedIterator` can be thought of as a deque in that `next()` and `next_back()` exhaust /// elements from the *same* range, and do not work independently of each other. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub trait DoubleEndedIterator: Iterator { /// Yield an element from the end of the range, returning `None` if the range is empty. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn next_back(&mut self) -> Option; } @@ -978,7 +982,8 @@ pub trait DoubleEndedIterator: Iterator { /// Calling `next()` or `next_back()` on a `RandomAccessIterator` /// reduces the indexable range accordingly. That is, `it.idx(1)` will become `it.idx(0)` /// after `it.next()` is called. -#[unstable = "not widely used, may be better decomposed into Index and ExactSizeIterator"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "not widely used, may be better decomposed into Index and ExactSizeIterator")] pub trait RandomAccessIterator: Iterator { /// Return the number of indexable elements. At most `std::uint::MAX` /// elements are indexable, even if the iterator represents a longer range. @@ -995,7 +1000,7 @@ pub trait RandomAccessIterator: Iterator { /// /// `Iterator::size_hint` *must* return the exact size of the iterator. /// Note that the size must fit in `uint`. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub trait ExactSizeIterator: Iterator { #[inline] /// Return the exact length of the iterator. @@ -1012,32 +1017,32 @@ pub trait ExactSizeIterator: Iterator { // All adaptors that preserve the size of the wrapped iterator are fine // Adaptors that may overflow in `size_hint` are not, i.e. `Chain`. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl ExactSizeIterator for Enumerate where I: ExactSizeIterator {} -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl ExactSizeIterator for Inspect where I: ExactSizeIterator, F: FnMut(&A), {} -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl ExactSizeIterator for Rev where I: ExactSizeIterator + DoubleEndedIterator {} -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl ExactSizeIterator for Map where I: ExactSizeIterator, F: FnMut(A) -> B, {} -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl ExactSizeIterator for Zip where A: ExactSizeIterator, B: ExactSizeIterator {} /// An double-ended iterator with the direction inverted #[derive(Clone)] #[must_use = "iterator adaptors are lazy and do nothing unless consumed"] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Rev { iter: T } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Iterator for Rev where I: DoubleEndedIterator { type Item = ::Item; @@ -1047,13 +1052,13 @@ impl Iterator for Rev where I: DoubleEndedIterator { fn size_hint(&self) -> (uint, Option) { self.iter.size_hint() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl DoubleEndedIterator for Rev where I: DoubleEndedIterator { #[inline] fn next_back(&mut self) -> Option<::Item> { self.iter.next() } } -#[unstable = "trait is experimental"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "trait is experimental")] impl RandomAccessIterator for Rev where I: DoubleEndedIterator + RandomAccessIterator { #[inline] fn indexable(&self) -> uint { self.iter.indexable() } @@ -1066,12 +1071,12 @@ impl RandomAccessIterator for Rev where I: DoubleEndedIterator + RandomAcc /// A mutable reference to an iterator #[must_use = "iterator adaptors are lazy and do nothing unless consumed"] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct ByRef<'a, I:'a> { iter: &'a mut I, } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, I> Iterator for ByRef<'a, I> where I: 'a + Iterator { type Item = ::Item; @@ -1081,14 +1086,15 @@ impl<'a, I> Iterator for ByRef<'a, I> where I: 'a + Iterator { fn size_hint(&self) -> (uint, Option) { self.iter.size_hint() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, I> DoubleEndedIterator for ByRef<'a, I> where I: 'a + DoubleEndedIterator { #[inline] fn next_back(&mut self) -> Option<::Item> { self.iter.next_back() } } /// A trait for iterators over elements which can be added together -#[unstable = "needs to be re-evaluated as part of numerics reform"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "needs to be re-evaluated as part of numerics reform")] pub trait AdditiveIterator { /// Iterates over the entire iterator, summing up all the elements /// @@ -1106,7 +1112,7 @@ pub trait AdditiveIterator { macro_rules! impl_additive { ($A:ty, $init:expr) => { - #[unstable = "trait is experimental"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "trait is experimental")] impl> AdditiveIterator<$A> for T { #[inline] fn sum(self) -> $A { @@ -1129,7 +1135,8 @@ impl_additive! { f32, 0.0 } impl_additive! { f64, 0.0 } /// A trait for iterators over elements which can be multiplied together. -#[unstable = "needs to be re-evaluated as part of numerics reform"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "needs to be re-evaluated as part of numerics reform")] pub trait MultiplicativeIterator { /// Iterates over the entire iterator, multiplying all the elements /// @@ -1150,7 +1157,7 @@ pub trait MultiplicativeIterator { macro_rules! impl_multiplicative { ($A:ty, $init:expr) => { - #[unstable = "trait is experimental"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "trait is experimental")] impl> MultiplicativeIterator<$A> for T { #[inline] fn product(self) -> $A { @@ -1174,7 +1181,8 @@ impl_multiplicative! { f64, 1.0 } /// `MinMaxResult` is an enum returned by `min_max`. See `IteratorOrdExt::min_max` for more detail. #[derive(Clone, PartialEq, Show)] -#[unstable = "unclear whether such a fine-grained result is widely useful"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "unclear whether such a fine-grained result is widely useful")] pub enum MinMaxResult { /// Empty iterator NoElements, @@ -1206,7 +1214,7 @@ impl MinMaxResult { /// let r = MinMax(1i,2i); /// assert_eq!(r.into_option(), Some((1,2))); /// ``` - #[unstable = "type is unstable"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "type is unstable")] pub fn into_option(self) -> Option<(T,T)> { match self { NoElements => None, @@ -1217,14 +1225,14 @@ impl MinMaxResult { } /// An iterator that clones the elements of an underlying iterator -#[unstable = "recent addition"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "recent addition")] #[must_use = "iterator adaptors are lazy and do nothing unless consumed"] #[derive(Clone)] pub struct Cloned { it: I, } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Iterator for Cloned where T: Clone, D: Deref, @@ -1241,7 +1249,7 @@ impl Iterator for Cloned where } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl DoubleEndedIterator for Cloned where T: Clone, D: Deref, @@ -1252,7 +1260,7 @@ impl DoubleEndedIterator for Cloned where } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl ExactSizeIterator for Cloned where T: Clone, D: Deref, @@ -1262,13 +1270,13 @@ impl ExactSizeIterator for Cloned where /// An iterator that repeats endlessly #[derive(Clone, Copy)] #[must_use = "iterator adaptors are lazy and do nothing unless consumed"] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Cycle { orig: I, iter: I, } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Iterator for Cycle where I: Clone + Iterator { type Item = ::Item; @@ -1291,7 +1299,7 @@ impl Iterator for Cycle where I: Clone + Iterator { } } -#[unstable = "trait is experimental"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "trait is experimental")] impl RandomAccessIterator for Cycle where I: Clone + RandomAccessIterator, { @@ -1321,14 +1329,14 @@ impl RandomAccessIterator for Cycle where /// An iterator that strings two iterators together #[derive(Clone)] #[must_use = "iterator adaptors are lazy and do nothing unless consumed"] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Chain { a: A, b: B, flag: bool, } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Iterator for Chain where A: Iterator, B: Iterator { type Item = T; @@ -1362,7 +1370,7 @@ impl Iterator for Chain where A: Iterator, B: Iterator DoubleEndedIterator for Chain where A: DoubleEndedIterator, B: DoubleEndedIterator, @@ -1376,7 +1384,7 @@ impl DoubleEndedIterator for Chain where } } -#[unstable = "trait is experimental"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "trait is experimental")] impl RandomAccessIterator for Chain where A: RandomAccessIterator, B: RandomAccessIterator, @@ -1401,13 +1409,13 @@ impl RandomAccessIterator for Chain where /// An iterator that iterates two other iterators simultaneously #[derive(Clone)] #[must_use = "iterator adaptors are lazy and do nothing unless consumed"] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Zip { a: A, b: B } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Iterator for Zip where A: Iterator, B: Iterator, @@ -1443,7 +1451,7 @@ impl Iterator for Zip where } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl DoubleEndedIterator for Zip where A: DoubleEndedIterator + ExactSizeIterator, B: DoubleEndedIterator + ExactSizeIterator, @@ -1468,7 +1476,7 @@ impl DoubleEndedIterator for Zip where } } -#[unstable = "trait is experimental"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "trait is experimental")] impl RandomAccessIterator for Zip where A: RandomAccessIterator, B: RandomAccessIterator, @@ -1492,14 +1500,14 @@ impl RandomAccessIterator for Zip where /// An iterator that maps the values of `iter` with `f` #[must_use = "iterator adaptors are lazy and do nothing unless consumed"] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Map, F: FnMut(A) -> B> { iter: I, f: F, } // FIXME(#19839) Remove in favor of `#[derive(Clone)]` -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Clone for Map where I: Clone + Iterator, F: Clone + FnMut(A) -> B, @@ -1522,7 +1530,7 @@ impl Map where I: Iterator, F: FnMut(A) -> B { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Iterator for Map where I: Iterator, F: FnMut(A) -> B { type Item = B; @@ -1538,7 +1546,7 @@ impl Iterator for Map where I: Iterator, F: FnMu } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl DoubleEndedIterator for Map where I: DoubleEndedIterator, F: FnMut(A) -> B, @@ -1550,7 +1558,7 @@ impl DoubleEndedIterator for Map where } } -#[unstable = "trait is experimental"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "trait is experimental")] impl RandomAccessIterator for Map where I: RandomAccessIterator, F: FnMut(A) -> B, @@ -1569,14 +1577,14 @@ impl RandomAccessIterator for Map where /// An iterator that filters the elements of `iter` with `predicate` #[must_use = "iterator adaptors are lazy and do nothing unless consumed"] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Filter where I: Iterator, P: FnMut(&A) -> bool { iter: I, predicate: P, } // FIXME(#19839) Remove in favor of `#[derive(Clone)]` -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Clone for Filter where I: Clone + Iterator, P: Clone + FnMut(&A) -> bool, @@ -1589,7 +1597,7 @@ impl Clone for Filter where } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Iterator for Filter where I: Iterator, P: FnMut(&A) -> bool { type Item = A; @@ -1612,7 +1620,7 @@ impl Iterator for Filter where I: Iterator, P: FnMut(& } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl DoubleEndedIterator for Filter where I: DoubleEndedIterator, P: FnMut(&A) -> bool, @@ -1630,14 +1638,14 @@ impl DoubleEndedIterator for Filter where /// An iterator that uses `f` to both filter and map elements from `iter` #[must_use = "iterator adaptors are lazy and do nothing unless consumed"] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct FilterMap where I: Iterator, F: FnMut(A) -> Option { iter: I, f: F, } // FIXME(#19839) Remove in favor of `#[derive(Clone)]` -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Clone for FilterMap where I: Clone + Iterator, F: Clone + FnMut(A) -> Option, @@ -1650,7 +1658,7 @@ impl Clone for FilterMap where } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Iterator for FilterMap where I: Iterator, F: FnMut(A) -> Option, @@ -1675,7 +1683,7 @@ impl Iterator for FilterMap where } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl DoubleEndedIterator for FilterMap where I: DoubleEndedIterator, F: FnMut(A) -> Option, @@ -1695,13 +1703,13 @@ impl DoubleEndedIterator for FilterMap where /// An iterator that yields the current count and the element during iteration #[derive(Clone)] #[must_use = "iterator adaptors are lazy and do nothing unless consumed"] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Enumerate { iter: I, count: uint } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Iterator for Enumerate where I: Iterator { type Item = (uint, ::Item); @@ -1723,7 +1731,7 @@ impl Iterator for Enumerate where I: Iterator { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl DoubleEndedIterator for Enumerate where I: ExactSizeIterator + DoubleEndedIterator { @@ -1739,7 +1747,7 @@ impl DoubleEndedIterator for Enumerate where } } -#[unstable = "trait is experimental"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "trait is experimental")] impl RandomAccessIterator for Enumerate where I: RandomAccessIterator { #[inline] fn indexable(&self) -> uint { @@ -1757,14 +1765,14 @@ impl RandomAccessIterator for Enumerate where I: RandomAccessIterator { /// An iterator with a `peek()` that returns an optional reference to the next element. #[must_use = "iterator adaptors are lazy and do nothing unless consumed"] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] #[derive(Copy)] pub struct Peekable where I: Iterator { iter: I, peeked: Option, } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Iterator for Peekable where I: Iterator { type Item = T; @@ -1790,7 +1798,7 @@ impl Iterator for Peekable where I: Iterator { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Peekable where I: Iterator { /// Return a reference to the next element of the iterator with out advancing it, /// or None if the iterator is exhausted. @@ -1814,7 +1822,7 @@ impl Peekable where I: Iterator { /// An iterator that rejects elements while `predicate` is true #[must_use = "iterator adaptors are lazy and do nothing unless consumed"] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct SkipWhile where I: Iterator, P: FnMut(&A) -> bool { iter: I, flag: bool, @@ -1822,7 +1830,7 @@ pub struct SkipWhile where I: Iterator, P: FnMut(&A) -> bool { } // FIXME(#19839) Remove in favor of `#[derive(Clone)]` -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Clone for SkipWhile where I: Clone + Iterator, P: Clone + FnMut(&A) -> bool, @@ -1836,7 +1844,7 @@ impl Clone for SkipWhile where } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Iterator for SkipWhile where I: Iterator, P: FnMut(&A) -> bool { type Item = A; @@ -1860,7 +1868,7 @@ impl Iterator for SkipWhile where I: Iterator, P: FnMu /// An iterator that only accepts elements while `predicate` is true #[must_use = "iterator adaptors are lazy and do nothing unless consumed"] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct TakeWhile where I: Iterator, P: FnMut(&A) -> bool { iter: I, flag: bool, @@ -1868,7 +1876,7 @@ pub struct TakeWhile where I: Iterator, P: FnMut(&A) -> bool { } // FIXME(#19839) Remove in favor of `#[derive(Clone)]` -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Clone for TakeWhile where I: Clone + Iterator, P: Clone + FnMut(&A) -> bool, @@ -1882,7 +1890,7 @@ impl Clone for TakeWhile where } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Iterator for TakeWhile where I: Iterator, P: FnMut(&A) -> bool { type Item = A; @@ -1915,13 +1923,13 @@ impl Iterator for TakeWhile where I: Iterator, P: FnMu /// An iterator that skips over `n` elements of `iter`. #[derive(Clone)] #[must_use = "iterator adaptors are lazy and do nothing unless consumed"] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Skip { iter: I, n: uint } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Iterator for Skip where I: Iterator { type Item = ::Item; @@ -1965,7 +1973,7 @@ impl Iterator for Skip where I: Iterator { } } -#[unstable = "trait is experimental"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "trait is experimental")] impl RandomAccessIterator for Skip where I: RandomAccessIterator{ #[inline] fn indexable(&self) -> uint { @@ -1985,13 +1993,13 @@ impl RandomAccessIterator for Skip where I: RandomAccessIterator{ /// An iterator that only iterates over the first `n` iterations of `iter`. #[derive(Clone)] #[must_use = "iterator adaptors are lazy and do nothing unless consumed"] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Take { iter: I, n: uint } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Iterator for Take where I: Iterator{ type Item = ::Item; @@ -2020,7 +2028,7 @@ impl Iterator for Take where I: Iterator{ } } -#[unstable = "trait is experimental"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "trait is experimental")] impl RandomAccessIterator for Take where I: RandomAccessIterator{ #[inline] fn indexable(&self) -> uint { @@ -2040,7 +2048,7 @@ impl RandomAccessIterator for Take where I: RandomAccessIterator{ /// An iterator to maintain state while iterating another iterator #[must_use = "iterator adaptors are lazy and do nothing unless consumed"] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Scan where I: Iterator, F: FnMut(&mut St, A) -> Option { iter: I, f: F, @@ -2050,7 +2058,7 @@ pub struct Scan where I: Iterator, F: FnMut(&mut St, A) -> Optio } // FIXME(#19839) Remove in favor of `#[derive(Clone)]` -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Clone for Scan where I: Clone + Iterator, St: Clone, @@ -2065,7 +2073,7 @@ impl Clone for Scan where } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Iterator for Scan where I: Iterator, F: FnMut(&mut St, A) -> Option, @@ -2088,7 +2096,7 @@ impl Iterator for Scan where /// and yields the elements of the produced iterators /// #[must_use = "iterator adaptors are lazy and do nothing unless consumed"] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct FlatMap where I: Iterator, U: Iterator, @@ -2101,7 +2109,7 @@ pub struct FlatMap where } // FIXME(#19839) Remove in favor of `#[derive(Clone)]` -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Clone for FlatMap where I: Clone + Iterator, U: Clone + Iterator, @@ -2117,7 +2125,7 @@ impl Clone for FlatMap where } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Iterator for FlatMap where I: Iterator, U: Iterator, @@ -2152,7 +2160,7 @@ impl Iterator for FlatMap where } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl DoubleEndedIterator for FlatMap where I: DoubleEndedIterator, U: DoubleEndedIterator, @@ -2179,13 +2187,13 @@ impl DoubleEndedIterator for FlatMap where /// yields `None` once. #[derive(Clone)] #[must_use = "iterator adaptors are lazy and do nothing unless consumed"] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Fuse { iter: I, done: bool } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Iterator for Fuse where I: Iterator { type Item = ::Item; @@ -2214,7 +2222,7 @@ impl Iterator for Fuse where I: Iterator { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl DoubleEndedIterator for Fuse where I: DoubleEndedIterator { #[inline] fn next_back(&mut self) -> Option<::Item> { @@ -2233,7 +2241,7 @@ impl DoubleEndedIterator for Fuse where I: DoubleEndedIterator { } // Allow RandomAccessIterators to be fused without affecting random-access behavior -#[unstable = "trait is experimental"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "trait is experimental")] impl RandomAccessIterator for Fuse where I: RandomAccessIterator { #[inline] fn indexable(&self) -> uint { @@ -2250,7 +2258,7 @@ impl Fuse { /// Resets the fuse such that the next call to .next() or .next_back() will /// call the underlying iterator again even if it previously returned None. #[inline] - #[unstable = "seems marginal"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "seems marginal")] pub fn reset_fuse(&mut self) { self.done = false } @@ -2259,14 +2267,14 @@ impl Fuse { /// An iterator that calls a function with a reference to each /// element before yielding it. #[must_use = "iterator adaptors are lazy and do nothing unless consumed"] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Inspect where I: Iterator, F: FnMut(&A) { iter: I, f: F, } // FIXME(#19839) Remove in favor of `#[derive(Clone)]` -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Clone for Inspect where I: Clone + Iterator, F: Clone + FnMut(&A), @@ -2291,7 +2299,7 @@ impl Inspect where I: Iterator, F: FnMut(&A) { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Iterator for Inspect where I: Iterator, F: FnMut(&A) { type Item = A; @@ -2307,7 +2315,7 @@ impl Iterator for Inspect where I: Iterator, F: FnMut( } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl DoubleEndedIterator for Inspect where I: DoubleEndedIterator, F: FnMut(&A), @@ -2319,7 +2327,7 @@ impl DoubleEndedIterator for Inspect where } } -#[unstable = "trait is experimental"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "trait is experimental")] impl RandomAccessIterator for Inspect where I: RandomAccessIterator, F: FnMut(&A), @@ -2368,7 +2376,7 @@ impl RandomAccessIterator for Inspect where /// println!("{}", i); /// } /// ``` -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] pub struct Unfold where F: FnMut(&mut St) -> Option { f: F, /// Internal state that will be passed to the closure on the next iteration @@ -2376,7 +2384,7 @@ pub struct Unfold where F: FnMut(&mut St) -> Option { } // FIXME(#19839) Remove in favor of `#[derive(Clone)]` -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Clone for Unfold where F: Clone + FnMut(&mut St) -> Option, St: Clone, @@ -2389,7 +2397,7 @@ impl Clone for Unfold where } } -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] impl Unfold where F: FnMut(&mut St) -> Option { /// Creates a new iterator with the specified closure as the "iterator /// function" and an initial state to eventually pass to the closure @@ -2402,7 +2410,7 @@ impl Unfold where F: FnMut(&mut St) -> Option { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Iterator for Unfold where F: FnMut(&mut St) -> Option { type Item = A; @@ -2421,7 +2429,8 @@ impl Iterator for Unfold where F: FnMut(&mut St) -> Option { /// The current state the counter is at (next value to be yielded) state: A, @@ -2431,12 +2440,13 @@ pub struct Counter { /// Creates a new counter with the specified start/step #[inline] -#[unstable = "may be renamed or replaced by range notation adapaters"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "may be renamed or replaced by range notation adapaters")] pub fn count(start: A, step: A) -> Counter { Counter{state: start, step: step} } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl + Clone> Iterator for Counter { type Item = A; @@ -2455,7 +2465,8 @@ impl + Clone> Iterator for Counter { /// An iterator over the range [start, stop) #[derive(Clone, Copy)] -#[unstable = "will be replaced by range notation"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "will be replaced by range notation")] pub struct Range { state: A, stop: A, @@ -2476,7 +2487,8 @@ pub struct Range { /// } /// ``` #[inline] -#[unstable = "will be replaced by range notation"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "will be replaced by range notation")] pub fn range(start: A, stop: A) -> Range { Range { state: start, @@ -2486,7 +2498,8 @@ pub fn range(start: A, stop: A) -> Range { } // FIXME: #10414: Unfortunate type bound -#[unstable = "will be replaced by range notation"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "will be replaced by range notation")] impl Iterator for Range { type Item = A; @@ -2536,7 +2549,8 @@ impl Iterator for Range { /// `Int` is required to ensure the range will be the same regardless of /// the direction it is consumed. -#[unstable = "will be replaced by range notation"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "will be replaced by range notation")] impl DoubleEndedIterator for Range { #[inline] fn next_back(&mut self) -> Option { @@ -2551,7 +2565,8 @@ impl DoubleEndedIterator for Range { /// An iterator over the range [start, stop] #[derive(Clone)] -#[unstable = "likely to be replaced by range notation and adapters"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "likely to be replaced by range notation and adapters")] pub struct RangeInclusive { range: Range, done: bool, @@ -2559,7 +2574,8 @@ pub struct RangeInclusive { /// Return an iterator over the range [start, stop] #[inline] -#[unstable = "likely to be replaced by range notation and adapters"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "likely to be replaced by range notation and adapters")] pub fn range_inclusive(start: A, stop: A) -> RangeInclusive { RangeInclusive { range: range(start, stop), @@ -2567,7 +2583,8 @@ pub fn range_inclusive(start: A, stop: A) -> RangeInclusive { } } -#[unstable = "likely to be replaced by range notation and adapters"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "likely to be replaced by range notation and adapters")] impl Iterator for RangeInclusive { type Item = A; @@ -2602,7 +2619,8 @@ impl Iterator for RangeInclusive { } } -#[unstable = "likely to be replaced by range notation and adapters"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "likely to be replaced by range notation and adapters")] impl DoubleEndedIterator for RangeInclusive { #[inline] fn next_back(&mut self) -> Option { @@ -2621,7 +2639,8 @@ impl DoubleEndedIterator for RangeInclusive { /// An iterator over the range [start, stop) by `step`. It handles overflow by stopping. #[derive(Clone)] -#[unstable = "likely to be replaced by range notation and adapters"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "likely to be replaced by range notation and adapters")] pub struct RangeStep { state: A, stop: A, @@ -2631,13 +2650,15 @@ pub struct RangeStep { /// Return an iterator over the range [start, stop) by `step`. It handles overflow by stopping. #[inline] -#[unstable = "likely to be replaced by range notation and adapters"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "likely to be replaced by range notation and adapters")] pub fn range_step(start: A, stop: A, step: A) -> RangeStep { let rev = step < Int::zero(); RangeStep{state: start, stop: stop, step: step, rev: rev} } -#[unstable = "likely to be replaced by range notation and adapters"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "likely to be replaced by range notation and adapters")] impl Iterator for RangeStep { type Item = A; @@ -2658,7 +2679,8 @@ impl Iterator for RangeStep { /// An iterator over the range [start, stop] by `step`. It handles overflow by stopping. #[derive(Clone)] -#[unstable = "likely to be replaced by range notation and adapters"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "likely to be replaced by range notation and adapters")] pub struct RangeStepInclusive { state: A, stop: A, @@ -2669,7 +2691,8 @@ pub struct RangeStepInclusive { /// Return an iterator over the range [start, stop] by `step`. It handles overflow by stopping. #[inline] -#[unstable = "likely to be replaced by range notation and adapters"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "likely to be replaced by range notation and adapters")] pub fn range_step_inclusive(start: A, stop: A, step: A) -> RangeStepInclusive { let rev = step < Int::zero(); RangeStepInclusive { @@ -2681,7 +2704,8 @@ pub fn range_step_inclusive(start: A, stop: A, step: A) -> RangeStepIncl } } -#[unstable = "likely to be replaced by range notation and adapters"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "likely to be replaced by range notation and adapters")] impl Iterator for RangeStepInclusive { type Item = A; @@ -2706,7 +2730,8 @@ impl Iterator for RangeStepInclusive { /// directions. The `steps_between` function provides a way to /// compare two Step objects (it could be provided using `step()` and `Ord`, /// but the implementation would be so inefficient as to be useless). -#[unstable = "design of range notation/iteration is in flux"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "design of range notation/iteration is in flux")] pub trait Step: Ord { /// Change self to the next object. fn step(&mut self); @@ -2721,7 +2746,7 @@ pub trait Step: Ord { macro_rules! step_impl { ($($t:ty)*) => ($( - #[unstable = "Trait is unstable."] + #[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "Trait is unstable.")] impl Step for $t { #[inline] fn step(&mut self) { *self += 1; } @@ -2738,7 +2763,7 @@ macro_rules! step_impl { macro_rules! step_impl_no_between { ($($t:ty)*) => ($( - #[unstable = "Trait is unstable."] + #[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "Trait is unstable.")] impl Step for $t { #[inline] fn step(&mut self) { *self += 1; } @@ -2761,12 +2786,12 @@ step_impl_no_between!(u64 i64); /// An iterator that repeats an element endlessly #[derive(Clone)] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Repeat { element: A } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Iterator for Repeat { type Item = A; @@ -2776,13 +2801,13 @@ impl Iterator for Repeat { fn size_hint(&self) -> (uint, Option) { (uint::MAX, None) } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl DoubleEndedIterator for Repeat { #[inline] fn next_back(&mut self) -> Option { self.idx(0) } } -#[unstable = "trait is experimental"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "trait is experimental")] impl RandomAccessIterator for Repeat { #[inline] fn indexable(&self) -> uint { uint::MAX } @@ -2794,12 +2819,12 @@ type IterateState = (F, Option, bool); /// An iterator that repeatedly applies a given function, starting /// from a given seed value. -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] pub type Iterate = Unfold, fn(&mut IterateState) -> Option>; /// Create a new iterator that produces an infinite sequence of /// repeated applications of the given function `f`. -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn iterate(seed: T, f: F) -> Iterate where T: Clone, F: FnMut(T) -> T, @@ -2830,7 +2855,7 @@ pub fn iterate(seed: T, f: F) -> Iterate where /// Create a new iterator that endlessly repeats the element `elt`. #[inline] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub fn repeat(elt: T) -> Repeat { Repeat{element: elt} } @@ -2842,7 +2867,7 @@ pub fn repeat(elt: T) -> Repeat { /// /// If two sequences are equal up until the point where one ends, /// the shorter sequence compares less. -#[unstable = "needs review and revision"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "needs review and revision")] pub mod order { use cmp; use cmp::{Eq, Ord, PartialOrd, PartialEq}; diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs index 0b150d1ecf9..ecb4af218cd 100644 --- a/src/libcore/lib.rs +++ b/src/libcore/lib.rs @@ -48,7 +48,7 @@ // separate crate, libcoretest, to avoid bizarre issues. #![crate_name = "core"] -#![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/libcore/macros.rs b/src/libcore/macros.rs index 1c37126e8e9..65a17c91c87 100644 --- a/src/libcore/macros.rs +++ b/src/libcore/macros.rs @@ -52,7 +52,7 @@ macro_rules! panic { /// assert!(a + b == 30, "a = {}, b = {}", a, b); /// ``` #[macro_export] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] macro_rules! assert { ($cond:expr) => ( if !$cond { @@ -79,7 +79,7 @@ macro_rules! assert { /// assert_eq!(a, b); /// ``` #[macro_export] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] macro_rules! assert_eq { ($left:expr , $right:expr) => ({ match (&($left), &($right)) { @@ -123,7 +123,7 @@ macro_rules! assert_eq { /// debug_assert!(a + b == 30, "a = {}, b = {}", a, b); /// ``` #[macro_export] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] macro_rules! debug_assert { ($($arg:tt)*) => (if cfg!(not(ndebug)) { assert!($($arg)*); }) } @@ -185,7 +185,7 @@ macro_rules! write { /// Equivalent to the `write!` macro, except that a newline is appended after /// the message is written. #[macro_export] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] macro_rules! writeln { ($dst:expr, $fmt:expr) => ( write!($dst, concat!($fmt, "\n")) @@ -235,7 +235,8 @@ macro_rules! writeln { /// } /// ``` #[macro_export] -#[unstable = "relationship with panic is unclear"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "relationship with panic is unclear")] macro_rules! unreachable { () => ({ panic!("internal error: entered unreachable code") @@ -251,7 +252,8 @@ macro_rules! unreachable { /// A standardised placeholder for marking unfinished code. It panics with the /// message `"not yet implemented"` when executed. #[macro_export] -#[unstable = "relationship with panic is unclear"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "relationship with panic is unclear")] macro_rules! unimplemented { () => (panic!("not yet implemented")) } diff --git a/src/libcore/marker.rs b/src/libcore/marker.rs index 99ba9666cd2..4c9384b266a 100644 --- a/src/libcore/marker.rs +++ b/src/libcore/marker.rs @@ -23,19 +23,20 @@ //! implemented using unsafe code. In that case, you may want to embed //! some of the marker types below into your type. -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] use clone::Clone; /// Types able to be transferred across task boundaries. -#[unstable = "will be overhauled with new lifetime rules; see RFC 458"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "will be overhauled with new lifetime rules; see RFC 458")] #[lang="send"] pub unsafe trait Send: 'static { // empty. } /// Types with a constant size known at compile-time. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] #[lang="sized"] pub trait Sized { // Empty. @@ -140,7 +141,7 @@ pub trait Sized { /// to consider though: if you think your type may _not_ be able to implement `Copy` in the future, /// then it might be prudent to not implement `Copy`. This is because removing `Copy` is a breaking /// change: that second example would fail to compile if we made `Foo` non-`Copy`. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] #[lang="copy"] pub trait Copy { // Empty. @@ -191,7 +192,8 @@ pub trait Copy { /// around the value(s) which can be mutated when behind a `&` /// reference; not doing this is undefined behaviour (for example, /// `transmute`-ing from `&T` to `&mut T` is illegal). -#[unstable = "will be overhauled with new lifetime rules; see RFC 458"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "will be overhauled with new lifetime rules; see RFC 458")] #[lang="sync"] pub unsafe trait Sync { // Empty @@ -235,7 +237,8 @@ pub unsafe trait Sync { /// `S` is a subtype of `S` if `T` is a subtype of `U` /// (for example, `S<&'static int>` is a subtype of `S<&'a int>` /// for some lifetime `'a`, but not the other way around). -#[unstable = "likely to change with new variance strategy"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "likely to change with new variance strategy")] #[lang="covariant_type"] #[derive(PartialEq, Eq, PartialOrd, Ord)] pub struct CovariantType; @@ -284,7 +287,8 @@ impl Clone for CovariantType { /// subtype of `S` if `U` is a subtype of `T`; given that the /// function requires arguments of type `T`, it must also accept /// arguments of type `U`, hence such a conversion is safe. -#[unstable = "likely to change with new variance strategy"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "likely to change with new variance strategy")] #[lang="contravariant_type"] #[derive(PartialEq, Eq, PartialOrd, Ord)] pub struct ContravariantType; @@ -314,14 +318,17 @@ impl Clone for ContravariantType { /// The type system would infer that `value` is only read here and /// never written, but in fact `Cell` uses unsafe code to achieve /// interior mutability. -#[unstable = "likely to change with new variance strategy"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "likely to change with new variance strategy")] #[lang="invariant_type"] #[derive(PartialEq, Eq, PartialOrd, Ord)] pub struct InvariantType; -#[unstable = "likely to change with new variance strategy"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "likely to change with new variance strategy")] impl Copy for InvariantType {} -#[unstable = "likely to change with new variance strategy"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "likely to change with new variance strategy")] impl Clone for InvariantType { fn clone(&self) -> InvariantType { *self } } @@ -342,7 +349,8 @@ impl Clone for InvariantType { /// /// For more information about variance, refer to this Wikipedia /// article . -#[unstable = "likely to change with new variance strategy"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "likely to change with new variance strategy")] #[lang="covariant_lifetime"] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord)] pub struct CovariantLifetime<'a>; @@ -359,7 +367,8 @@ pub struct CovariantLifetime<'a>; /// /// For more information about variance, refer to this Wikipedia /// article . -#[unstable = "likely to change with new variance strategy"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "likely to change with new variance strategy")] #[lang="contravariant_lifetime"] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord)] pub struct ContravariantLifetime<'a>; @@ -371,7 +380,8 @@ pub struct ContravariantLifetime<'a>; /// pointer that is actually a pointer into memory with lifetime `'a`, /// and this pointer is itself stored in an inherently mutable /// location (such as a `Cell`). -#[unstable = "likely to change with new variance strategy"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "likely to change with new variance strategy")] #[lang="invariant_lifetime"] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord)] pub struct InvariantLifetime<'a>; @@ -380,7 +390,8 @@ pub struct InvariantLifetime<'a>; /// be safely sent between tasks, even if it is owned. This is /// typically embedded in other types, such as `Gc`, to ensure that /// their instances remain thread-local. -#[unstable = "likely to change with new variance strategy"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "likely to change with new variance strategy")] #[lang="no_send_bound"] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord)] #[cfg(stage0)] // NOTE remove impl after next snapshot @@ -389,7 +400,8 @@ pub struct NoSend; /// A type which is considered "not POD", meaning that it is not /// implicitly copyable. This is typically embedded in other types to /// ensure that they are never copied, even if they lack a destructor. -#[unstable = "likely to change with new variance strategy"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "likely to change with new variance strategy")] #[lang="no_copy_bound"] #[derive(Clone, PartialEq, Eq, PartialOrd, Ord)] #[allow(missing_copy_implementations)] @@ -398,7 +410,8 @@ pub struct NoCopy; /// A type which is considered "not sync", meaning that /// its contents are not threadsafe, hence they cannot be /// shared between tasks. -#[unstable = "likely to change with new variance strategy"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "likely to change with new variance strategy")] #[lang="no_sync_bound"] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord)] #[cfg(stage0)] // NOTE remove impl after next snapshot @@ -406,7 +419,8 @@ pub struct NoSync; /// A type which is considered managed by the GC. This is typically /// embedded in other types. -#[unstable = "likely to change with new variance strategy"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "likely to change with new variance strategy")] #[lang="managed_bound"] #[derive(Clone, PartialEq, Eq, PartialOrd, Ord)] #[allow(missing_copy_implementations)] diff --git a/src/libcore/mem.rs b/src/libcore/mem.rs index 8438c9b206e..b28df93b359 100644 --- a/src/libcore/mem.rs +++ b/src/libcore/mem.rs @@ -13,13 +13,13 @@ //! This module contains functions for querying the size and alignment of //! types, initializing and manipulating memory. -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] use marker::Sized; use intrinsics; use ptr; -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub use intrinsics::transmute; /// Moves a thing into the void. @@ -29,7 +29,7 @@ pub use intrinsics::transmute; /// /// This function is the unsafe version of the `drop` function because it does /// not run any destructors. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub use intrinsics::forget; /// Returns the size of a type in bytes. @@ -42,7 +42,7 @@ pub use intrinsics::forget; /// assert_eq!(4, mem::size_of::()); /// ``` #[inline] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub fn size_of() -> uint { unsafe { intrinsics::size_of::() } } @@ -57,7 +57,7 @@ pub fn size_of() -> uint { /// assert_eq!(4, mem::size_of_val(&5i32)); /// ``` #[inline] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub fn size_of_val(_val: &T) -> uint { size_of::() } @@ -74,7 +74,7 @@ pub fn size_of_val(_val: &T) -> uint { /// assert_eq!(4, mem::min_align_of::()); /// ``` #[inline] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub fn min_align_of() -> uint { unsafe { intrinsics::min_align_of::() } } @@ -89,7 +89,7 @@ pub fn min_align_of() -> uint { /// assert_eq!(4, mem::min_align_of_val(&5i32)); /// ``` #[inline] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub fn min_align_of_val(_val: &T) -> uint { min_align_of::() } @@ -107,7 +107,7 @@ pub fn min_align_of_val(_val: &T) -> uint { /// assert_eq!(4, mem::align_of::()); /// ``` #[inline] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub fn align_of() -> uint { // We use the preferred alignment as the default alignment for a type. This // appears to be what clang migrated towards as well: @@ -129,7 +129,7 @@ pub fn align_of() -> uint { /// assert_eq!(4, mem::align_of_val(&5i32)); /// ``` #[inline] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub fn align_of_val(_val: &T) -> uint { align_of::() } @@ -153,7 +153,7 @@ pub fn align_of_val(_val: &T) -> uint { /// let x: int = unsafe { mem::zeroed() }; /// ``` #[inline] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub unsafe fn zeroed() -> T { intrinsics::init() } @@ -174,7 +174,7 @@ pub unsafe fn zeroed() -> T { /// let x: int = unsafe { mem::uninitialized() }; /// ``` #[inline] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub unsafe fn uninitialized() -> T { intrinsics::uninit() } @@ -196,7 +196,7 @@ pub unsafe fn uninitialized() -> T { /// assert_eq!(5i, *y); /// ``` #[inline] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub fn swap(x: &mut T, y: &mut T) { unsafe { // Give ourselves some scratch space to work with @@ -261,7 +261,7 @@ pub fn swap(x: &mut T, y: &mut T) { /// } /// ``` #[inline] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub fn replace(dest: &mut T, mut src: T) -> T { swap(dest, &mut src); src @@ -288,7 +288,7 @@ pub fn replace(dest: &mut T, mut src: T) -> T { /// println!("{}", *borrow); /// ``` #[inline] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub fn drop(_x: T) { } /// Interprets `src` as `&U`, and then reads `src` without moving the contained value. @@ -311,15 +311,16 @@ pub fn drop(_x: T) { } /// assert_eq!(1u, one); /// ``` #[inline] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub unsafe fn transmute_copy(src: &T) -> U { ptr::read(src as *const T as *const U) } /// Transforms lifetime of the second pointer to match the first. #[inline] -#[unstable = "this function may be removed in the future due to its \ - questionable utility"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "this function may be removed in the future due to its \ + questionable utility")] pub unsafe fn copy_lifetime<'a, S: ?Sized, T: ?Sized + 'a>(_ptr: &'a S, ptr: &T) -> &'a T { transmute(ptr) @@ -327,8 +328,9 @@ pub unsafe fn copy_lifetime<'a, S: ?Sized, T: ?Sized + 'a>(_ptr: &'a S, /// Transforms lifetime of the second mutable pointer to match the first. #[inline] -#[unstable = "this function may be removed in the future due to its \ - questionable utility"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "this function may be removed in the future due to its \ + questionable utility")] pub unsafe fn copy_mut_lifetime<'a, S: ?Sized, T: ?Sized + 'a>(_ptr: &'a mut S, ptr: &mut T) -> &'a mut T { diff --git a/src/libcore/nonzero.rs b/src/libcore/nonzero.rs index abaf2529323..111d2f074b1 100644 --- a/src/libcore/nonzero.rs +++ b/src/libcore/nonzero.rs @@ -32,7 +32,7 @@ unsafe impl Zeroable for u64 {} /// NULL or 0 that might allow certain optimizations. #[lang="non_zero"] #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Show)] -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] pub struct NonZero(T); impl NonZero { diff --git a/src/libcore/num/f32.rs b/src/libcore/num/f32.rs index f8a85e788e9..9aecd761e2a 100644 --- a/src/libcore/num/f32.rs +++ b/src/libcore/num/f32.rs @@ -14,7 +14,7 @@ // FIXME: MIN_VALUE and MAX_VALUE literals are parsed as -inf and inf #14353 #![allow(overflowing_literals)] -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] use intrinsics; use mem; @@ -22,46 +22,47 @@ use num::Float; use num::FpCategory as Fp; use option::Option; -#[unstable = "pending integer conventions"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "pending integer conventions")] pub const RADIX: uint = 2u; -#[unstable = "pending integer conventions"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "pending integer conventions")] pub const MANTISSA_DIGITS: uint = 24u; -#[unstable = "pending integer conventions"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "pending integer conventions")] pub const DIGITS: uint = 6u; -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub const EPSILON: f32 = 1.19209290e-07_f32; /// Smallest finite f32 value -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub const MIN_VALUE: f32 = -3.40282347e+38_f32; /// Smallest positive, normalized f32 value -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub const MIN_POS_VALUE: f32 = 1.17549435e-38_f32; /// Largest finite f32 value -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub const MAX_VALUE: f32 = 3.40282347e+38_f32; -#[unstable = "pending integer conventions"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "pending integer conventions")] pub const MIN_EXP: int = -125; -#[unstable = "pending integer conventions"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "pending integer conventions")] pub const MAX_EXP: int = 128; -#[unstable = "pending integer conventions"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "pending integer conventions")] pub const MIN_10_EXP: int = -37; -#[unstable = "pending integer conventions"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "pending integer conventions")] pub const MAX_10_EXP: int = 38; -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub const NAN: f32 = 0.0_f32/0.0_f32; -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub const INFINITY: f32 = 1.0_f32/0.0_f32; -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub const NEG_INFINITY: f32 = -1.0_f32/0.0_f32; /// Various useful constants. -#[unstable = "naming scheme needs to be revisited"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "naming scheme needs to be revisited")] pub mod consts { // FIXME: replace with mathematical constants from cmath. @@ -117,7 +118,7 @@ pub mod consts { pub const LN_10: f32 = 2.30258509299404568401799145468436421_f32; } -#[unstable = "trait is unstable"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "trait is unstable")] impl Float for f32 { #[inline] fn nan() -> f32 { NAN } @@ -177,43 +178,43 @@ impl Float for f32 { } #[inline] - #[deprecated] + #[deprecated(feature = "oldstuff", since = "1.0.0")] fn mantissa_digits(_: Option) -> uint { MANTISSA_DIGITS } #[inline] - #[deprecated] + #[deprecated(feature = "oldstuff", since = "1.0.0")] fn digits(_: Option) -> uint { DIGITS } #[inline] - #[deprecated] + #[deprecated(feature = "oldstuff", since = "1.0.0")] fn epsilon() -> f32 { EPSILON } #[inline] - #[deprecated] + #[deprecated(feature = "oldstuff", since = "1.0.0")] fn min_exp(_: Option) -> int { MIN_EXP } #[inline] - #[deprecated] + #[deprecated(feature = "oldstuff", since = "1.0.0")] fn max_exp(_: Option) -> int { MAX_EXP } #[inline] - #[deprecated] + #[deprecated(feature = "oldstuff", since = "1.0.0")] fn min_10_exp(_: Option) -> int { MIN_10_EXP } #[inline] - #[deprecated] + #[deprecated(feature = "oldstuff", since = "1.0.0")] fn max_10_exp(_: Option) -> int { MAX_10_EXP } #[inline] - #[deprecated] + #[deprecated(feature = "oldstuff", since = "1.0.0")] fn min_value() -> f32 { MIN_VALUE } #[inline] - #[deprecated] + #[deprecated(feature = "oldstuff", since = "1.0.0")] fn min_pos_value(_: Option) -> f32 { MIN_POS_VALUE } #[inline] - #[deprecated] + #[deprecated(feature = "oldstuff", since = "1.0.0")] fn max_value() -> f32 { MAX_VALUE } /// Returns the mantissa, exponent and sign as integers. diff --git a/src/libcore/num/f64.rs b/src/libcore/num/f64.rs index 840428179cd..1961b6cb0a8 100644 --- a/src/libcore/num/f64.rs +++ b/src/libcore/num/f64.rs @@ -14,7 +14,7 @@ // FIXME: MIN_VALUE and MAX_VALUE literals are parsed as -inf and inf #14353 #![allow(overflowing_literals)] -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] use intrinsics; use mem; @@ -26,45 +26,46 @@ use option::Option; // constants are implemented in favour of referencing the respective // members of `Bounded` and `Float`. -#[unstable = "pending integer conventions"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "pending integer conventions")] pub const RADIX: uint = 2u; pub const MANTISSA_DIGITS: uint = 53u; -#[unstable = "pending integer conventions"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "pending integer conventions")] pub const DIGITS: uint = 15u; -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub const EPSILON: f64 = 2.2204460492503131e-16_f64; /// Smallest finite f64 value -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub const MIN_VALUE: f64 = -1.7976931348623157e+308_f64; /// Smallest positive, normalized f64 value -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub const MIN_POS_VALUE: f64 = 2.2250738585072014e-308_f64; /// Largest finite f64 value -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub const MAX_VALUE: f64 = 1.7976931348623157e+308_f64; -#[unstable = "pending integer conventions"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "pending integer conventions")] pub const MIN_EXP: int = -1021; -#[unstable = "pending integer conventions"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "pending integer conventions")] pub const MAX_EXP: int = 1024; -#[unstable = "pending integer conventions"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "pending integer conventions")] pub const MIN_10_EXP: int = -307; -#[unstable = "pending integer conventions"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "pending integer conventions")] pub const MAX_10_EXP: int = 308; -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub const NAN: f64 = 0.0_f64/0.0_f64; -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub const INFINITY: f64 = 1.0_f64/0.0_f64; -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub const NEG_INFINITY: f64 = -1.0_f64/0.0_f64; /// Various useful constants. -#[unstable = "naming scheme needs to be revisited"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "naming scheme needs to be revisited")] pub mod consts { // FIXME: replace with mathematical constants from cmath. @@ -124,7 +125,7 @@ pub mod consts { pub const LN_10: f64 = 2.30258509299404568401799145468436421_f64; } -#[unstable = "trait is unstable"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "trait is unstable")] impl Float for f64 { #[inline] fn nan() -> f64 { NAN } @@ -184,43 +185,43 @@ impl Float for f64 { } #[inline] - #[deprecated] + #[deprecated(feature = "oldstuff", since = "1.0.0")] fn mantissa_digits(_: Option) -> uint { MANTISSA_DIGITS } #[inline] - #[deprecated] + #[deprecated(feature = "oldstuff", since = "1.0.0")] fn digits(_: Option) -> uint { DIGITS } #[inline] - #[deprecated] + #[deprecated(feature = "oldstuff", since = "1.0.0")] fn epsilon() -> f64 { EPSILON } #[inline] - #[deprecated] + #[deprecated(feature = "oldstuff", since = "1.0.0")] fn min_exp(_: Option) -> int { MIN_EXP } #[inline] - #[deprecated] + #[deprecated(feature = "oldstuff", since = "1.0.0")] fn max_exp(_: Option) -> int { MAX_EXP } #[inline] - #[deprecated] + #[deprecated(feature = "oldstuff", since = "1.0.0")] fn min_10_exp(_: Option) -> int { MIN_10_EXP } #[inline] - #[deprecated] + #[deprecated(feature = "oldstuff", since = "1.0.0")] fn max_10_exp(_: Option) -> int { MAX_10_EXP } #[inline] - #[deprecated] + #[deprecated(feature = "oldstuff", since = "1.0.0")] fn min_value() -> f64 { MIN_VALUE } #[inline] - #[deprecated] + #[deprecated(feature = "oldstuff", since = "1.0.0")] fn min_pos_value(_: Option) -> f64 { MIN_POS_VALUE } #[inline] - #[deprecated] + #[deprecated(feature = "oldstuff", since = "1.0.0")] fn max_value() -> f64 { MAX_VALUE } /// Returns the mantissa, exponent and sign as integers. diff --git a/src/libcore/num/i16.rs b/src/libcore/num/i16.rs index eb2a4c3835d..53d87a65666 100644 --- a/src/libcore/num/i16.rs +++ b/src/libcore/num/i16.rs @@ -10,7 +10,7 @@ //! Operations and constants for signed 16-bits integers (`i16` type) -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] #![doc(primitive = "i16")] int_module! { i16, 16 } diff --git a/src/libcore/num/i32.rs b/src/libcore/num/i32.rs index 849fa205756..71203428225 100644 --- a/src/libcore/num/i32.rs +++ b/src/libcore/num/i32.rs @@ -10,7 +10,7 @@ //! Operations and constants for signed 32-bits integers (`i32` type) -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] #![doc(primitive = "i32")] int_module! { i32, 32 } diff --git a/src/libcore/num/i64.rs b/src/libcore/num/i64.rs index b6cba728e44..7d485317beb 100644 --- a/src/libcore/num/i64.rs +++ b/src/libcore/num/i64.rs @@ -10,7 +10,7 @@ //! Operations and constants for signed 64-bits integers (`i64` type) -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] #![doc(primitive = "i64")] int_module! { i64, 64 } diff --git a/src/libcore/num/i8.rs b/src/libcore/num/i8.rs index fd0759898ea..cc2a2b76a69 100644 --- a/src/libcore/num/i8.rs +++ b/src/libcore/num/i8.rs @@ -10,7 +10,7 @@ //! Operations and constants for signed 8-bits integers (`i8` type) -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] #![doc(primitive = "i8")] int_module! { i8, 8 } diff --git a/src/libcore/num/int.rs b/src/libcore/num/int.rs index 83011db35ce..4b4e408ddd7 100644 --- a/src/libcore/num/int.rs +++ b/src/libcore/num/int.rs @@ -14,7 +14,7 @@ //! alpha cycle along with the development of clearer conventions //! around integer types. -#![deprecated = "replaced by isize"] +#![deprecated(feature = "oldstuff", since = "1.0.0", reason = "replaced by isize")] #[cfg(target_pointer_width = "32")] int_module! { int, 32 } #[cfg(target_pointer_width = "64")] int_module! { int, 64 } diff --git a/src/libcore/num/int_macros.rs b/src/libcore/num/int_macros.rs index 61cd8cbf7c1..2f0f6443877 100644 --- a/src/libcore/num/int_macros.rs +++ b/src/libcore/num/int_macros.rs @@ -14,21 +14,21 @@ macro_rules! int_module { ($T:ty, $bits:expr) => ( // FIXME(#11621): Should be deprecated once CTFE is implemented in favour of // calling the `mem::size_of` function. -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] pub const BITS : uint = $bits; // FIXME(#11621): Should be deprecated once CTFE is implemented in favour of // calling the `mem::size_of` function. -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] pub const BYTES : uint = ($bits / 8); // FIXME(#11621): Should be deprecated once CTFE is implemented in favour of // calling the `Bounded::min_value` function. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub const MIN: $T = (-1 as $T) << (BITS - 1); // FIXME(#9837): Compute MIN like this so the high bits that shouldn't exist are 0. // FIXME(#11621): Should be deprecated once CTFE is implemented in favour of // calling the `Bounded::max_value` function. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub const MAX: $T = !MIN; ) } diff --git a/src/libcore/num/isize.rs b/src/libcore/num/isize.rs index e4711c92c59..2f5db884174 100644 --- a/src/libcore/num/isize.rs +++ b/src/libcore/num/isize.rs @@ -14,7 +14,7 @@ //! new type will gradually take place over the alpha cycle along with //! the development of clearer conventions around integer types. -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] #![doc(primitive = "isize")] #[cfg(target_pointer_width = "32")] diff --git a/src/libcore/num/mod.rs b/src/libcore/num/mod.rs index 599a5515e3b..5b0b6f1b046 100644 --- a/src/libcore/num/mod.rs +++ b/src/libcore/num/mod.rs @@ -12,7 +12,7 @@ //! Numeric traits and functions for the built-in numeric types. -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] #![allow(missing_docs)] use char::CharExt; @@ -30,7 +30,7 @@ use option::Option::{Some, None}; use str::{FromStr, StrExt}; /// A built-in signed or unsigned integer. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub trait Int : Copy + Clone + NumCast @@ -50,22 +50,26 @@ pub trait Int { /// Returns the `0` value of this integer type. // FIXME (#5527): Should be an associated constant - #[unstable = "unsure about its place in the world"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "unsure about its place in the world")] fn zero() -> Self; /// Returns the `1` value of this integer type. // FIXME (#5527): Should be an associated constant - #[unstable = "unsure about its place in the world"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "unsure about its place in the world")] fn one() -> Self; /// Returns the smallest value that can be represented by this integer type. // FIXME (#5527): Should be and associated constant - #[unstable = "unsure about its place in the world"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "unsure about its place in the world")] fn min_value() -> Self; /// Returns the largest value that can be represented by this integer type. // FIXME (#5527): Should be and associated constant - #[unstable = "unsure about its place in the world"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "unsure about its place in the world")] fn max_value() -> Self; /// Returns the number of ones in the binary representation of `self`. @@ -79,7 +83,8 @@ pub trait Int /// /// assert_eq!(n.count_ones(), 3); /// ``` - #[unstable = "pending integer conventions"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "pending integer conventions")] fn count_ones(self) -> uint; /// Returns the number of zeros in the binary representation of `self`. @@ -93,7 +98,8 @@ pub trait Int /// /// assert_eq!(n.count_zeros(), 5); /// ``` - #[unstable = "pending integer conventions"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "pending integer conventions")] #[inline] fn count_zeros(self) -> uint { (!self).count_ones() @@ -111,7 +117,8 @@ pub trait Int /// /// assert_eq!(n.leading_zeros(), 10); /// ``` - #[unstable = "pending integer conventions"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "pending integer conventions")] fn leading_zeros(self) -> uint; /// Returns the number of trailing zeros in the binary representation @@ -126,7 +133,8 @@ pub trait Int /// /// assert_eq!(n.trailing_zeros(), 3); /// ``` - #[unstable = "pending integer conventions"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "pending integer conventions")] fn trailing_zeros(self) -> uint; /// Shifts the bits to the left by a specified amount amount, `n`, wrapping @@ -142,7 +150,8 @@ pub trait Int /// /// assert_eq!(n.rotate_left(12), m); /// ``` - #[unstable = "pending integer conventions"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "pending integer conventions")] fn rotate_left(self, n: uint) -> Self; /// Shifts the bits to the right by a specified amount amount, `n`, wrapping @@ -158,7 +167,8 @@ pub trait Int /// /// assert_eq!(n.rotate_right(12), m); /// ``` - #[unstable = "pending integer conventions"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "pending integer conventions")] fn rotate_right(self, n: uint) -> Self; /// Reverses the byte order of the integer. @@ -173,7 +183,7 @@ pub trait Int /// /// assert_eq!(n.swap_bytes(), m); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn swap_bytes(self) -> Self; /// Convert an integer from big endian to the target's endianness. @@ -193,7 +203,7 @@ pub trait Int /// assert_eq!(Int::from_be(n), n.swap_bytes()) /// } /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] #[inline] fn from_be(x: Self) -> Self { if cfg!(target_endian = "big") { x } else { x.swap_bytes() } @@ -216,7 +226,7 @@ pub trait Int /// assert_eq!(Int::from_le(n), n.swap_bytes()) /// } /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] #[inline] fn from_le(x: Self) -> Self { if cfg!(target_endian = "little") { x } else { x.swap_bytes() } @@ -239,7 +249,7 @@ pub trait Int /// assert_eq!(n.to_be(), n.swap_bytes()) /// } /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] #[inline] fn to_be(self) -> Self { // or not to be? if cfg!(target_endian = "big") { self } else { self.swap_bytes() } @@ -262,7 +272,7 @@ pub trait Int /// assert_eq!(n.to_le(), n.swap_bytes()) /// } /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] #[inline] fn to_le(self) -> Self { if cfg!(target_endian = "little") { self } else { self.swap_bytes() } @@ -279,7 +289,7 @@ pub trait Int /// assert_eq!(5u16.checked_add(65530), Some(65535)); /// assert_eq!(6u16.checked_add(65530), None); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn checked_add(self, other: Self) -> Option; /// Checked integer subtraction. Computes `self - other`, returning `None` @@ -293,7 +303,7 @@ pub trait Int /// assert_eq!((-127i8).checked_sub(1), Some(-128)); /// assert_eq!((-128i8).checked_sub(1), None); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn checked_sub(self, other: Self) -> Option; /// Checked integer multiplication. Computes `self * other`, returning @@ -307,7 +317,7 @@ pub trait Int /// assert_eq!(5u8.checked_mul(51), Some(255)); /// assert_eq!(5u8.checked_mul(52), None); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn checked_mul(self, other: Self) -> Option; /// Checked integer division. Computes `self / other`, returning `None` if @@ -322,12 +332,12 @@ pub trait Int /// assert_eq!((-128i8).checked_div(-1), None); /// assert_eq!((1i8).checked_div(0), None); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn checked_div(self, other: Self) -> Option; /// Saturating integer addition. Computes `self + other`, saturating at /// the numeric bounds instead of overflowing. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] #[inline] fn saturating_add(self, other: Self) -> Self { match self.checked_add(other) { @@ -339,7 +349,7 @@ pub trait Int /// Saturating integer subtraction. Computes `self - other`, saturating at /// the numeric bounds instead of overflowing. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] #[inline] fn saturating_sub(self, other: Self) -> Self { match self.checked_sub(other) { @@ -358,7 +368,8 @@ pub trait Int /// /// assert_eq!(2i.pow(4), 16); /// ``` - #[unstable = "pending integer conventions"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "pending integer conventions")] #[inline] fn pow(self, mut exp: uint) -> Self { let mut base = self; @@ -390,7 +401,7 @@ macro_rules! uint_impl { $add_with_overflow:path, $sub_with_overflow:path, $mul_with_overflow:path) => { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl Int for $T { #[inline] fn zero() -> $T { 0 } @@ -521,7 +532,7 @@ macro_rules! int_impl { $add_with_overflow:path, $sub_with_overflow:path, $mul_with_overflow:path) => { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl Int for $T { #[inline] fn zero() -> $T { 0 } @@ -614,14 +625,14 @@ int_impl! { int = i64, u64, 64, intrinsics::i64_mul_with_overflow } /// A built-in two's complement integer. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub trait SignedInt : Int + Neg { /// Computes the absolute value of `self`. `Int::min_value()` will be /// returned if the number is `Int::min_value()`. - #[unstable = "overflow in debug builds?"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "overflow in debug builds?")] fn abs(self) -> Self; /// Returns a number representing sign of `self`. @@ -629,23 +640,23 @@ pub trait SignedInt /// - `0` if the number is zero /// - `1` if the number is positive /// - `-1` if the number is negative - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn signum(self) -> Self; /// Returns `true` if `self` is positive and `false` if the number /// is zero or negative. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn is_positive(self) -> bool; /// Returns `true` if `self` is negative and `false` if the number /// is zero or positive. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn is_negative(self) -> bool; } macro_rules! signed_int_impl { ($T:ty) => { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl SignedInt for $T { #[inline] fn abs(self) -> $T { @@ -677,10 +688,10 @@ signed_int_impl! { i64 } signed_int_impl! { int } /// A built-in unsigned integer. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub trait UnsignedInt: Int { /// Returns `true` iff `self == 2^k` for some `k`. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] #[inline] fn is_power_of_two(self) -> bool { (self - Int::one()) & self == Int::zero() && !(self == Int::zero()) @@ -688,7 +699,7 @@ pub trait UnsignedInt: Int { /// Returns the smallest power of two greater than or equal to `self`. /// Unspecified behavior on overflow. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] #[inline] fn next_power_of_two(self) -> Self { let bits = size_of::() * 8; @@ -699,7 +710,7 @@ pub trait UnsignedInt: Int { /// Returns the smallest power of two greater than or equal to `n`. If the /// next power of two is greater than the type's maximum value, `None` is /// returned, otherwise the power of two is wrapped in `Some`. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn checked_next_power_of_two(self) -> Option { let npot = self.next_power_of_two(); if npot >= self { @@ -710,23 +721,23 @@ pub trait UnsignedInt: Int { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl UnsignedInt for uint {} -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl UnsignedInt for u8 {} -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl UnsignedInt for u16 {} -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl UnsignedInt for u32 {} -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl UnsignedInt for u64 {} /// A generic trait for converting a value to a number. -#[unstable = "trait is likely to be removed"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "trait is likely to be removed")] pub trait ToPrimitive { /// Converts the value of `self` to an `int`. #[inline] @@ -991,7 +1002,7 @@ impl_to_primitive_float! { f32 } impl_to_primitive_float! { f64 } /// A generic trait for converting a number to a value. -#[unstable = "trait is likely to be removed"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "trait is likely to be removed")] pub trait FromPrimitive : ::marker::Sized { /// Convert an `int` to return an optional value of this type. If the /// value cannot be represented by this value, the `None` is returned. @@ -1073,73 +1084,73 @@ pub trait FromPrimitive : ::marker::Sized { } /// A utility function that just calls `FromPrimitive::from_int`. -#[unstable = "likely to be removed"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "likely to be removed")] pub fn from_int(n: int) -> Option { FromPrimitive::from_int(n) } /// A utility function that just calls `FromPrimitive::from_i8`. -#[unstable = "likely to be removed"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "likely to be removed")] pub fn from_i8(n: i8) -> Option { FromPrimitive::from_i8(n) } /// A utility function that just calls `FromPrimitive::from_i16`. -#[unstable = "likely to be removed"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "likely to be removed")] pub fn from_i16(n: i16) -> Option { FromPrimitive::from_i16(n) } /// A utility function that just calls `FromPrimitive::from_i32`. -#[unstable = "likely to be removed"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "likely to be removed")] pub fn from_i32(n: i32) -> Option { FromPrimitive::from_i32(n) } /// A utility function that just calls `FromPrimitive::from_i64`. -#[unstable = "likely to be removed"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "likely to be removed")] pub fn from_i64(n: i64) -> Option { FromPrimitive::from_i64(n) } /// A utility function that just calls `FromPrimitive::from_uint`. -#[unstable = "likely to be removed"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "likely to be removed")] pub fn from_uint(n: uint) -> Option { FromPrimitive::from_uint(n) } /// A utility function that just calls `FromPrimitive::from_u8`. -#[unstable = "likely to be removed"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "likely to be removed")] pub fn from_u8(n: u8) -> Option { FromPrimitive::from_u8(n) } /// A utility function that just calls `FromPrimitive::from_u16`. -#[unstable = "likely to be removed"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "likely to be removed")] pub fn from_u16(n: u16) -> Option { FromPrimitive::from_u16(n) } /// A utility function that just calls `FromPrimitive::from_u32`. -#[unstable = "likely to be removed"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "likely to be removed")] pub fn from_u32(n: u32) -> Option { FromPrimitive::from_u32(n) } /// A utility function that just calls `FromPrimitive::from_u64`. -#[unstable = "likely to be removed"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "likely to be removed")] pub fn from_u64(n: u64) -> Option { FromPrimitive::from_u64(n) } /// A utility function that just calls `FromPrimitive::from_f32`. -#[unstable = "likely to be removed"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "likely to be removed")] pub fn from_f32(n: f32) -> Option { FromPrimitive::from_f32(n) } /// A utility function that just calls `FromPrimitive::from_f64`. -#[unstable = "likely to be removed"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "likely to be removed")] pub fn from_f64(n: f64) -> Option { FromPrimitive::from_f64(n) } @@ -1190,13 +1201,13 @@ impl_from_primitive! { f64, to_f64 } /// ``` /// #[inline] -#[unstable = "likely to be removed"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "likely to be removed")] pub fn cast(n: T) -> Option { NumCast::from(n) } /// An interface for casting between machine scalars. -#[unstable = "trait is likely to be removed"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "trait is likely to be removed")] pub trait NumCast: ToPrimitive { /// Creates a number from another value that can be converted into a primitive via the /// `ToPrimitive` trait. @@ -1231,7 +1242,7 @@ impl_num_cast! { f64, to_f64 } /// Used for representing the classification of floating point numbers #[derive(Copy, PartialEq, Show)] -#[unstable = "may be renamed"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "may be renamed")] pub enum FpCategory { /// "Not a Number", often obtained by dividing by zero Nan, @@ -1251,7 +1262,8 @@ pub enum FpCategory { // // FIXME(#8888): Several of these functions have a parameter named // `unused_self`. Removing it requires #8888 to be fixed. -#[unstable = "distribution of methods between core/std is unclear"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "distribution of methods between core/std is unclear")] pub trait Float : Copy + Clone + NumCast @@ -1280,34 +1292,46 @@ pub trait Float // FIXME (#5527): These should be associated constants /// Returns the number of binary digits of mantissa that this type supports. - #[deprecated = "use `std::f32::MANTISSA_DIGITS` or `std::f64::MANTISSA_DIGITS` as appropriate"] + #[deprecated(feature = "oldstuff", since = "1.0.0", + reason = "use `std::f32::MANTISSA_DIGITS` or \ + `std::f64::MANTISSA_DIGITS` as appropriate")] fn mantissa_digits(unused_self: Option) -> uint; /// Returns the number of base-10 digits of precision that this type supports. - #[deprecated = "use `std::f32::DIGITS` or `std::f64::DIGITS` as appropriate"] + #[deprecated(feature = "oldstuff", since = "1.0.0", + reason = "use `std::f32::DIGITS` or `std::f64::DIGITS` as appropriate")] fn digits(unused_self: Option) -> uint; /// Returns the difference between 1.0 and the smallest representable number larger than 1.0. - #[deprecated = "use `std::f32::EPSILON` or `std::f64::EPSILON` as appropriate"] + #[deprecated(feature = "oldstuff", since = "1.0.0", + reason = "use `std::f32::EPSILON` or `std::f64::EPSILON` as appropriate")] fn epsilon() -> Self; /// Returns the minimum binary exponent that this type can represent. - #[deprecated = "use `std::f32::MIN_EXP` or `std::f64::MIN_EXP` as appropriate"] + #[deprecated(feature = "oldstuff", since = "1.0.0", + reason = "use `std::f32::MIN_EXP` or `std::f64::MIN_EXP` as appropriate")] fn min_exp(unused_self: Option) -> int; /// Returns the maximum binary exponent that this type can represent. - #[deprecated = "use `std::f32::MAX_EXP` or `std::f64::MAX_EXP` as appropriate"] + #[deprecated(feature = "oldstuff", since = "1.0.0", + reason = "use `std::f32::MAX_EXP` or `std::f64::MAX_EXP` as appropriate")] fn max_exp(unused_self: Option) -> int; /// Returns the minimum base-10 exponent that this type can represent. - #[deprecated = "use `std::f32::MIN_10_EXP` or `std::f64::MIN_10_EXP` as appropriate"] + #[deprecated(feature = "oldstuff", since = "1.0.0", + reason = "use `std::f32::MIN_10_EXP` or `std::f64::MIN_10_EXP` as appropriate")] fn min_10_exp(unused_self: Option) -> int; /// Returns the maximum base-10 exponent that this type can represent. - #[deprecated = "use `std::f32::MAX_10_EXP` or `std::f64::MAX_10_EXP` as appropriate"] + #[deprecated(feature = "oldstuff", since = "1.0.0", + reason = "use `std::f32::MAX_10_EXP` or `std::f64::MAX_10_EXP` as appropriate")] fn max_10_exp(unused_self: Option) -> int; /// Returns the smallest finite value that this type can represent. - #[deprecated = "use `std::f32::MIN_VALUE` or `std::f64::MIN_VALUE` as appropriate"] + #[deprecated(feature = "oldstuff", since = "1.0.0", + reason = "use `std::f32::MIN_VALUE` or `std::f64::MIN_VALUE` as appropriate")] fn min_value() -> Self; /// Returns the smallest normalized positive number that this type can represent. - #[deprecated = "use `std::f32::MIN_POS_VALUE` or `std::f64::MIN_POS_VALUE` as appropriate"] + #[deprecated(feature = "oldstuff", since = "1.0.0", + reason = "use `std::f32::MIN_POS_VALUE` or \ + `std::f64::MIN_POS_VALUE` as appropriate")] fn min_pos_value(unused_self: Option) -> Self; /// Returns the largest finite value that this type can represent. - #[deprecated = "use `std::f32::MAX_VALUE` or `std::f64::MAX_VALUE` as appropriate"] + #[deprecated(feature = "oldstuff", since = "1.0.0", + reason = "use `std::f32::MAX_VALUE` or `std::f64::MAX_VALUE` as appropriate")] fn max_value() -> Self; /// Returns true if this value is NaN and false otherwise. @@ -1394,20 +1418,21 @@ pub trait Float } /// A generic trait for converting a string with a radix (base) to a value -#[unstable = "might need to return Result"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "might need to return Result")] pub trait FromStrRadix { fn from_str_radix(str: &str, radix: uint) -> Option; } /// A utility function that just calls FromStrRadix::from_str_radix. -#[unstable = "might need to return Result"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "might need to return Result")] pub fn from_str_radix(str: &str, radix: uint) -> Option { FromStrRadix::from_str_radix(str, radix) } macro_rules! from_str_radix_float_impl { ($T:ty) => { - #[unstable = "might need to return Result"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "might need to return Result")] impl FromStr for $T { /// Convert a string in base 10 to a float. /// Accepts an optional decimal exponent. @@ -1440,7 +1465,8 @@ macro_rules! from_str_radix_float_impl { } } - #[unstable = "might need to return Result"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "might need to return Result")] impl FromStrRadix for $T { /// Convert a string in a given base to a float. /// @@ -1604,7 +1630,8 @@ from_str_radix_float_impl! { f64 } macro_rules! from_str_radix_int_impl { ($T:ty) => { - #[unstable = "might need to return Result"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "might need to return Result")] impl FromStr for $T { #[inline] fn from_str(src: &str) -> Option<$T> { @@ -1612,7 +1639,8 @@ macro_rules! from_str_radix_int_impl { } } - #[unstable = "might need to return Result"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "might need to return Result")] impl FromStrRadix for $T { fn from_str_radix(src: &str, radix: uint) -> Option<$T> { assert!(radix >= 2 && radix <= 36, diff --git a/src/libcore/num/u16.rs b/src/libcore/num/u16.rs index 730a24a963a..187c7c85d42 100644 --- a/src/libcore/num/u16.rs +++ b/src/libcore/num/u16.rs @@ -10,7 +10,7 @@ //! Operations and constants for unsigned 16-bits integers (`u16` type) -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] #![doc(primitive = "u16")] uint_module! { u16, i16, 16 } diff --git a/src/libcore/num/u32.rs b/src/libcore/num/u32.rs index f308122af43..9a1afa64d27 100644 --- a/src/libcore/num/u32.rs +++ b/src/libcore/num/u32.rs @@ -10,7 +10,7 @@ //! Operations and constants for unsigned 32-bits integers (`u32` type) -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] #![doc(primitive = "u32")] uint_module! { u32, i32, 32 } diff --git a/src/libcore/num/u64.rs b/src/libcore/num/u64.rs index a55868eb746..390eb108252 100644 --- a/src/libcore/num/u64.rs +++ b/src/libcore/num/u64.rs @@ -10,7 +10,7 @@ //! Operations and constants for unsigned 64-bits integer (`u64` type) -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] #![doc(primitive = "u64")] uint_module! { u64, i64, 64 } diff --git a/src/libcore/num/u8.rs b/src/libcore/num/u8.rs index 8643f8ad650..ecf9efbf3c8 100644 --- a/src/libcore/num/u8.rs +++ b/src/libcore/num/u8.rs @@ -10,7 +10,7 @@ //! Operations and constants for unsigned 8-bits integers (`u8` type) -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] #![doc(primitive = "u8")] uint_module! { u8, i8, 8 } diff --git a/src/libcore/num/uint.rs b/src/libcore/num/uint.rs index 7931890ca5e..42f9c56c725 100644 --- a/src/libcore/num/uint.rs +++ b/src/libcore/num/uint.rs @@ -14,6 +14,6 @@ //! alpha cycle along with the development of clearer conventions //! around integer types. -#![deprecated = "replaced by usize"] +#![deprecated(feature = "oldstuff", since = "1.0.0", reason = "replaced by usize")] uint_module! { uint, int, ::int::BITS } diff --git a/src/libcore/num/uint_macros.rs b/src/libcore/num/uint_macros.rs index 535765840a0..50c22d374c6 100644 --- a/src/libcore/num/uint_macros.rs +++ b/src/libcore/num/uint_macros.rs @@ -12,14 +12,14 @@ macro_rules! uint_module { ($T:ty, $T_SIGNED:ty, $bits:expr) => ( -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] pub const BITS : uint = $bits; -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] pub const BYTES : uint = ($bits / 8); -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub const MIN: $T = 0 as $T; -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub const MAX: $T = 0 as $T - 1 as $T; ) } diff --git a/src/libcore/num/usize.rs b/src/libcore/num/usize.rs index 5eebcd51a77..4bcc21ccf51 100644 --- a/src/libcore/num/usize.rs +++ b/src/libcore/num/usize.rs @@ -14,7 +14,7 @@ //! new type will gradually take place over the alpha cycle along with //! the development of clearer conventions around integer types. -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] #![doc(primitive = "usize")] uint_module! { usize, isize, ::isize::BITS } diff --git a/src/libcore/ops.rs b/src/libcore/ops.rs index 905de9ef615..a490ad36020 100644 --- a/src/libcore/ops.rs +++ b/src/libcore/ops.rs @@ -67,7 +67,7 @@ //! See the documentation for each trait for a minimum implementation that prints //! something to the screen. -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] use clone::Clone; use iter::{Step, Iterator,DoubleEndedIterator,ExactSizeIterator}; @@ -97,10 +97,10 @@ use fmt; /// } /// ``` #[lang="drop"] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub trait Drop { /// The `drop` method, called when the value goes out of scope. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn drop(&mut self); } @@ -108,7 +108,8 @@ pub trait Drop { // based on "op T" where T is expected to be `Copy`able macro_rules! forward_ref_unop { (impl $imp:ident, $method:ident for $t:ty) => { - #[unstable = "recently added, waiting for dust to settle"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "recently added, waiting for dust to settle")] impl<'a> $imp for &'a $t { type Output = <$t as $imp>::Output; @@ -124,7 +125,8 @@ macro_rules! forward_ref_unop { // based on "T op U" where T and U are expected to be `Copy`able macro_rules! forward_ref_binop { (impl $imp:ident, $method:ident for $t:ty, $u:ty) => { - #[unstable = "recently added, waiting for dust to settle"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "recently added, waiting for dust to settle")] impl<'a> $imp<$u> for &'a $t { type Output = <$t as $imp<$u>>::Output; @@ -134,7 +136,8 @@ macro_rules! forward_ref_binop { } } - #[unstable = "recently added, waiting for dust to settle"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "recently added, waiting for dust to settle")] impl<'a> $imp<&'a $u> for $t { type Output = <$t as $imp<$u>>::Output; @@ -144,7 +147,8 @@ macro_rules! forward_ref_binop { } } - #[unstable = "recently added, waiting for dust to settle"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "recently added, waiting for dust to settle")] impl<'a, 'b> $imp<&'a $u> for &'b $t { type Output = <$t as $imp<$u>>::Output; @@ -185,19 +189,19 @@ macro_rules! forward_ref_binop { /// } /// ``` #[lang="add"] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub trait Add { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] type Output; /// The method for the `+` operator - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn add(self, rhs: RHS) -> Self::Output; } macro_rules! add_impl { ($($t:ty)*) => ($( - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl Add for $t { type Output = $t; @@ -240,19 +244,19 @@ add_impl! { uint u8 u16 u32 u64 int i8 i16 i32 i64 f32 f64 } /// } /// ``` #[lang="sub"] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub trait Sub { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] type Output; /// The method for the `-` operator - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn sub(self, rhs: RHS) -> Self::Output; } macro_rules! sub_impl { ($($t:ty)*) => ($( - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl Sub for $t { type Output = $t; @@ -295,19 +299,19 @@ sub_impl! { uint u8 u16 u32 u64 int i8 i16 i32 i64 f32 f64 } /// } /// ``` #[lang="mul"] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub trait Mul { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] type Output; /// The method for the `*` operator - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn mul(self, rhs: RHS) -> Self::Output; } macro_rules! mul_impl { ($($t:ty)*) => ($( - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl Mul for $t { type Output = $t; @@ -350,19 +354,19 @@ mul_impl! { uint u8 u16 u32 u64 int i8 i16 i32 i64 f32 f64 } /// } /// ``` #[lang="div"] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub trait Div { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] type Output; /// The method for the `/` operator - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn div(self, rhs: RHS) -> Self::Output; } macro_rules! div_impl { ($($t:ty)*) => ($( - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl Div for $t { type Output = $t; @@ -405,19 +409,19 @@ div_impl! { uint u8 u16 u32 u64 int i8 i16 i32 i64 f32 f64 } /// } /// ``` #[lang="rem"] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub trait Rem { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] type Output = Self; /// The method for the `%` operator - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn rem(self, rhs: RHS) -> Self::Output; } macro_rules! rem_impl { ($($t:ty)*) => ($( - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl Rem for $t { type Output = $t; @@ -431,7 +435,7 @@ macro_rules! rem_impl { macro_rules! rem_float_impl { ($t:ty, $fmod:ident) => { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl Rem for $t { type Output = $t; @@ -480,25 +484,25 @@ rem_float_impl! { f64, fmod } /// } /// ``` #[lang="neg"] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub trait Neg { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] type Output; /// The method for the unary `-` operator - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn neg(self) -> Self::Output; } macro_rules! neg_impl { ($($t:ty)*) => ($( - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl Neg for $t { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] type Output = $t; #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn neg(self) -> $t { -self } } @@ -508,7 +512,7 @@ macro_rules! neg_impl { macro_rules! neg_uint_impl { ($t:ty, $t_signed:ty) => { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl Neg for $t { type Output = $t; @@ -559,19 +563,19 @@ neg_uint_impl! { u64, i64 } /// } /// ``` #[lang="not"] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub trait Not { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] type Output; /// The method for the unary `!` operator - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn not(self) -> Self::Output; } macro_rules! not_impl { ($($t:ty)*) => ($( - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl Not for $t { type Output = $t; @@ -614,19 +618,19 @@ not_impl! { bool uint u8 u16 u32 u64 int i8 i16 i32 i64 } /// } /// ``` #[lang="bitand"] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub trait BitAnd { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] type Output; /// The method for the `&` operator - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn bitand(self, rhs: RHS) -> Self::Output; } macro_rules! bitand_impl { ($($t:ty)*) => ($( - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl BitAnd for $t { type Output = $t; @@ -669,19 +673,19 @@ bitand_impl! { bool uint u8 u16 u32 u64 int i8 i16 i32 i64 } /// } /// ``` #[lang="bitor"] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub trait BitOr { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] type Output; /// The method for the `|` operator - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn bitor(self, rhs: RHS) -> Self::Output; } macro_rules! bitor_impl { ($($t:ty)*) => ($( - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl BitOr for $t { type Output = $t; @@ -724,19 +728,19 @@ bitor_impl! { bool uint u8 u16 u32 u64 int i8 i16 i32 i64 } /// } /// ``` #[lang="bitxor"] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub trait BitXor { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] type Output; /// The method for the `^` operator - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn bitxor(self, rhs: RHS) -> Self::Output; } macro_rules! bitxor_impl { ($($t:ty)*) => ($( - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl BitXor for $t { type Output = $t; @@ -779,19 +783,19 @@ bitxor_impl! { bool uint u8 u16 u32 u64 int i8 i16 i32 i64 } /// } /// ``` #[lang="shl"] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub trait Shl { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] type Output; /// The method for the `<<` operator - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn shl(self, rhs: RHS) -> Self::Output; } macro_rules! shl_impl { ($t:ty, $f:ty) => ( - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl Shl<$f> for $t { type Output = $t; @@ -852,13 +856,13 @@ shl_impl_all! { u8 u16 u32 u64 usize i8 i16 i32 i64 isize } /// } /// ``` #[lang="shr"] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub trait Shr { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] type Output; /// The method for the `>>` operator - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn shr(self, rhs: RHS) -> Self::Output; } @@ -970,10 +974,10 @@ pub trait IndexMut { /// An unbounded range. #[derive(Copy, Clone, PartialEq, Eq)] #[lang="full_range"] -#[unstable = "API still in development"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "API still in development")] pub struct FullRange; -#[unstable = "API still in development"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "API still in development")] impl fmt::Show for FullRange { fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { fmt::Show::fmt("..", fmt) @@ -983,7 +987,7 @@ impl fmt::Show for FullRange { /// A (half-open) range which is bounded at both ends. #[derive(Copy, Clone, PartialEq, Eq)] #[lang="range"] -#[unstable = "API still in development"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "API still in development")] pub struct Range { /// The lower bound of the range (inclusive). pub start: Idx, @@ -991,7 +995,7 @@ pub struct Range { pub end: Idx, } -#[unstable = "API still in development"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "API still in development")] impl Iterator for Range { type Item = Idx; @@ -1016,7 +1020,7 @@ impl Iterator for Range { } } -#[unstable = "API still in development"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "API still in development")] impl DoubleEndedIterator for Range { #[inline] fn next_back(&mut self) -> Option { @@ -1029,10 +1033,10 @@ impl DoubleEndedIterator for Range { } } -#[unstable = "API still in development"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "API still in development")] impl ExactSizeIterator for Range {} -#[unstable = "API still in development"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "API still in development")] impl fmt::Show for Range { fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { write!(fmt, "{:?}..{:?}", self.start, self.end) @@ -1042,13 +1046,13 @@ impl fmt::Show for Range { /// A range which is only bounded below. #[derive(Copy, Clone, PartialEq, Eq)] #[lang="range_from"] -#[unstable = "API still in development"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "API still in development")] pub struct RangeFrom { /// The lower bound of the range (inclusive). pub start: Idx, } -#[unstable = "API still in development"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "API still in development")] impl Iterator for RangeFrom { type Item = Idx; @@ -1061,7 +1065,7 @@ impl Iterator for RangeFrom { } } -#[unstable = "API still in development"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "API still in development")] impl fmt::Show for RangeFrom { fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { write!(fmt, "{:?}..", self.start) @@ -1071,13 +1075,13 @@ impl fmt::Show for RangeFrom { /// A range which is only bounded above. #[derive(Copy, Clone, PartialEq, Eq)] #[lang="range_to"] -#[unstable = "API still in development"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "API still in development")] pub struct RangeTo { /// The upper bound of the range (exclusive). pub end: Idx, } -#[unstable = "API still in development"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "API still in development")] impl fmt::Show for RangeTo { fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { write!(fmt, "..{:?}", self.end) @@ -1116,24 +1120,24 @@ impl fmt::Show for RangeTo { /// } /// ``` #[lang="deref"] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub trait Deref { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] type Target: ?Sized; /// The method called to dereference a value - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn deref<'a>(&'a self) -> &'a Self::Target; } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T: ?Sized> Deref for &'a T { type Target = T; fn deref(&self) -> &T { *self } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T: ?Sized> Deref for &'a mut T { type Target = T; @@ -1178,21 +1182,22 @@ impl<'a, T: ?Sized> Deref for &'a mut T { /// } /// ``` #[lang="deref_mut"] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub trait DerefMut: Deref { /// The method called to mutably dereference a value - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn deref_mut<'a>(&'a mut self) -> &'a mut Self::Target; } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T: ?Sized> DerefMut for &'a mut T { fn deref_mut(&mut self) -> &mut T { *self } } /// A version of the call operator that takes an immutable receiver. #[lang="fn"] -#[unstable = "uncertain about variadic generics, input versus associated types"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "uncertain about variadic generics, input versus associated types")] pub trait Fn { /// This is called when the call operator is used. extern "rust-call" fn call(&self, args: Args) -> Result; @@ -1200,7 +1205,8 @@ pub trait Fn { /// A version of the call operator that takes a mutable receiver. #[lang="fn_mut"] -#[unstable = "uncertain about variadic generics, input versus associated types"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "uncertain about variadic generics, input versus associated types")] pub trait FnMut { /// This is called when the call operator is used. extern "rust-call" fn call_mut(&mut self, args: Args) -> Result; @@ -1208,7 +1214,8 @@ pub trait FnMut { /// A version of the call operator that takes a by-value receiver. #[lang="fn_once"] -#[unstable = "uncertain about variadic generics, input versus associated types"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "uncertain about variadic generics, input versus associated types")] pub trait FnOnce { /// This is called when the call operator is used. extern "rust-call" fn call_once(self, args: Args) -> Result; diff --git a/src/libcore/option.rs b/src/libcore/option.rs index af7fc875389..1c44ad00ae9 100644 --- a/src/libcore/option.rs +++ b/src/libcore/option.rs @@ -141,7 +141,7 @@ //! } //! ``` -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] use self::Option::*; @@ -164,13 +164,13 @@ use slice; /// The `Option` type. #[derive(Clone, Copy, PartialEq, PartialOrd, Eq, Ord, Show, Hash)] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub enum Option { /// No value - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] None, /// Some value `T` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] Some(T) } @@ -195,7 +195,7 @@ impl Option { /// assert_eq!(x.is_some(), false); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn is_some(&self) -> bool { match *self { Some(_) => true, @@ -215,7 +215,7 @@ impl Option { /// assert_eq!(x.is_none(), true); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn is_none(&self) -> bool { !self.is_some() } @@ -241,7 +241,7 @@ impl Option { /// println!("still can print num_as_str: {:?}", num_as_str); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn as_ref<'r>(&'r self) -> Option<&'r T> { match *self { Some(ref x) => Some(x), @@ -262,7 +262,7 @@ impl Option { /// assert_eq!(x, Some(42u)); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn as_mut<'r>(&'r mut self) -> Option<&'r mut T> { match *self { Some(ref mut x) => Some(x), @@ -285,7 +285,8 @@ impl Option { /// assert_eq!(x, Some("Dirt")); /// ``` #[inline] - #[unstable = "waiting for mut conventions"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "waiting for mut conventions")] pub fn as_mut_slice<'r>(&'r mut self) -> &'r mut [T] { match *self { Some(ref mut x) => { @@ -322,7 +323,7 @@ impl Option { /// x.expect("the world is ending"); // panics with `world is ending` /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn expect(self, msg: &str) -> T { match self { Some(val) => val, @@ -354,7 +355,7 @@ impl Option { /// assert_eq!(x.unwrap(), "air"); // fails /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn unwrap(self) -> T { match self { Some(val) => val, @@ -371,7 +372,7 @@ impl Option { /// assert_eq!(None.unwrap_or("bike"), "bike"); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn unwrap_or(self, def: T) -> T { match self { Some(x) => x, @@ -389,7 +390,7 @@ impl Option { /// assert_eq!(None.unwrap_or_else(|| 2 * k), 20u); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn unwrap_or_else T>(self, f: F) -> T { match self { Some(x) => x, @@ -413,7 +414,7 @@ impl Option { /// let num_as_int: Option = num_as_str.map(|n| n.len()); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn map U>(self, f: F) -> Option { match self { Some(x) => Some(f(x)), @@ -433,7 +434,7 @@ impl Option { /// assert_eq!(x.map_or(42u, |v| v.len()), 42u); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn map_or U>(self, def: U, f: F) -> U { match self { Some(t) => f(t), @@ -455,7 +456,7 @@ impl Option { /// assert_eq!(x.map_or_else(|| 2 * k, |v| v.len()), 42u); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn map_or_else U, F: FnOnce(T) -> U>(self, def: D, f: F) -> U { match self { Some(t) => f(t), @@ -476,7 +477,7 @@ impl Option { /// assert_eq!(x.ok_or(0i), Err(0i)); /// ``` #[inline] - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn ok_or(self, err: E) -> Result { match self { Some(v) => Ok(v), @@ -497,7 +498,7 @@ impl Option { /// assert_eq!(x.ok_or_else(|| 0i), Err(0i)); /// ``` #[inline] - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn ok_or_else E>(self, err: F) -> Result { match self { Some(v) => Ok(v), @@ -521,7 +522,7 @@ impl Option { /// assert_eq!(x.iter().next(), None); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn iter(&self) -> Iter { Iter { inner: Item { opt: self.as_ref() } } } @@ -542,7 +543,8 @@ impl Option { /// assert_eq!(x.iter_mut().next(), None); /// ``` #[inline] - #[unstable = "waiting for iterator conventions"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "waiting for iterator conventions")] pub fn iter_mut(&mut self) -> IterMut { IterMut { inner: Item { opt: self.as_mut() } } } @@ -561,7 +563,7 @@ impl Option { /// assert!(v.is_empty()); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn into_iter(self) -> IntoIter { IntoIter { inner: Item { opt: self } } } @@ -592,7 +594,7 @@ impl Option { /// assert_eq!(x.and(y), None); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn and(self, optb: Option) -> Option { match self { Some(_) => optb, @@ -615,7 +617,7 @@ impl Option { /// assert_eq!(None.and_then(sq).and_then(sq), None); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn and_then Option>(self, f: F) -> Option { match self { Some(x) => f(x), @@ -645,7 +647,7 @@ impl Option { /// assert_eq!(x.or(y), None); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn or(self, optb: Option) -> Option { match self { Some(_) => self, @@ -667,7 +669,7 @@ impl Option { /// assert_eq!(None.or_else(nobody), None); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn or_else Option>(self, f: F) -> Option { match self { Some(_) => self, @@ -693,7 +695,7 @@ impl Option { /// assert_eq!(x, None); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn take(&mut self) -> Option { mem::replace(self, None) } @@ -702,7 +704,8 @@ impl Option { impl<'a, T: Clone, D: Deref> Option { /// Maps an Option to an Option by dereffing and cloning the contents of the Option. /// Useful for converting an Option<&T> to an Option. - #[unstable = "recently added as part of collections reform"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "recently added as part of collections reform")] pub fn cloned(self) -> Option { self.map(|t| t.deref().clone()) } @@ -732,7 +735,7 @@ impl Option { /// assert_eq!(0i, bad_year); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn unwrap_or_default(self) -> T { match self { Some(x) => x, @@ -745,7 +748,8 @@ impl Option { // Trait implementations ///////////////////////////////////////////////////////////////////////////// -#[unstable = "waiting on the stability of the trait itself"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "waiting on the stability of the trait itself")] impl AsSlice for Option { /// Convert from `Option` to `&[T]` (without copying) #[inline] @@ -760,10 +764,10 @@ impl AsSlice for Option { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Default for Option { #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn default() -> Option { None } } @@ -803,10 +807,10 @@ impl DoubleEndedIterator for Item { impl ExactSizeIterator for Item {} /// An iterator over a reference of the contained item in an Option. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Iter<'a, A: 'a> { inner: Item<&'a A> } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, A> Iterator for Iter<'a, A> { type Item = &'a A; @@ -816,16 +820,16 @@ impl<'a, A> Iterator for Iter<'a, A> { fn size_hint(&self) -> (uint, Option) { self.inner.size_hint() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, A> DoubleEndedIterator for Iter<'a, A> { #[inline] fn next_back(&mut self) -> Option<&'a A> { self.inner.next_back() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, A> ExactSizeIterator for Iter<'a, A> {} -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, A> Clone for Iter<'a, A> { fn clone(&self) -> Iter<'a, A> { Iter { inner: self.inner.clone() } @@ -833,10 +837,10 @@ impl<'a, A> Clone for Iter<'a, A> { } /// An iterator over a mutable reference of the contained item in an Option. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct IterMut<'a, A: 'a> { inner: Item<&'a mut A> } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, A> Iterator for IterMut<'a, A> { type Item = &'a mut A; @@ -846,20 +850,20 @@ impl<'a, A> Iterator for IterMut<'a, A> { fn size_hint(&self) -> (uint, Option) { self.inner.size_hint() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, A> DoubleEndedIterator for IterMut<'a, A> { #[inline] fn next_back(&mut self) -> Option<&'a mut A> { self.inner.next_back() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, A> ExactSizeIterator for IterMut<'a, A> {} /// An iterator over the item contained inside an Option. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct IntoIter { inner: Item } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Iterator for IntoIter { type Item = A; @@ -869,20 +873,20 @@ impl Iterator for IntoIter { fn size_hint(&self) -> (uint, Option) { self.inner.size_hint() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl DoubleEndedIterator for IntoIter { #[inline] fn next_back(&mut self) -> Option { self.inner.next_back() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl ExactSizeIterator for IntoIter {} ///////////////////////////////////////////////////////////////////////////// // FromIterator ///////////////////////////////////////////////////////////////////////////// -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl> FromIterator> for Option { /// Takes each element in the `Iterator`: if it is `None`, no further /// elements are taken, and the `None` is returned. Should no `None` occur, a @@ -902,7 +906,7 @@ impl> FromIterator> for Option { /// assert!(res == Some(vec!(2u, 3u))); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn from_iter>>(iter: I) -> Option { // FIXME(#11084): This could be replaced with Iterator::scan when this // performance bug is closed. diff --git a/src/libcore/ptr.rs b/src/libcore/ptr.rs index 0b89467d63b..36ee97051ba 100644 --- a/src/libcore/ptr.rs +++ b/src/libcore/ptr.rs @@ -86,7 +86,7 @@ //! but C APIs hand out a lot of pointers generally, so are a common source //! of unsafe pointers in Rust. -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] use mem; use clone::Clone; @@ -99,13 +99,14 @@ use cmp::Ordering::{self, Less, Equal, Greater}; // FIXME #19649: intrinsic docs don't render, so these have no docs :( -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] pub use intrinsics::copy_nonoverlapping_memory; -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] pub use intrinsics::copy_memory; -#[unstable = "uncertain about naming and semantics"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "uncertain about naming and semantics")] pub use intrinsics::set_memory; @@ -120,7 +121,7 @@ pub use intrinsics::set_memory; /// assert!(p.is_null()); /// ``` #[inline] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub fn null() -> *const T { 0 as *const T } /// Creates a null mutable raw pointer. @@ -134,7 +135,7 @@ pub fn null() -> *const T { 0 as *const T } /// assert!(p.is_null()); /// ``` #[inline] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub fn null_mut() -> *mut T { 0 as *mut T } /// Zeroes out `count * size_of::` bytes of memory at `dst`. `count` may be @@ -145,7 +146,8 @@ pub fn null_mut() -> *mut T { 0 as *mut T } /// Beyond accepting a raw pointer, this is unsafe because it will not drop the /// contents of `dst`, and may be used to create invalid instances of `T`. #[inline] -#[unstable = "may play a larger role in std::ptr future extensions"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "may play a larger role in std::ptr future extensions")] pub unsafe fn zero_memory(dst: *mut T, count: uint) { set_memory(dst, 0, count); } @@ -158,7 +160,7 @@ pub unsafe fn zero_memory(dst: *mut T, count: uint) { /// /// This is only unsafe because it accepts a raw pointer. #[inline] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub unsafe fn swap(x: *mut T, y: *mut T) { // Give ourselves some scratch space to work with let mut tmp: T = mem::uninitialized(); @@ -182,7 +184,7 @@ pub unsafe fn swap(x: *mut T, y: *mut T) { /// This is only unsafe because it accepts a raw pointer. /// Otherwise, this operation is identical to `mem::replace`. #[inline] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub unsafe fn replace(dest: *mut T, mut src: T) -> T { mem::swap(mem::transmute(dest), &mut src); // cannot overlap src @@ -200,7 +202,7 @@ pub unsafe fn replace(dest: *mut T, mut src: T) -> T { /// `zero_memory`, or `copy_memory`). Note that `*src = foo` counts as a use /// because it will attempt to drop the value previously at `*src`. #[inline(always)] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub unsafe fn read(src: *const T) -> T { let mut tmp: T = mem::uninitialized(); copy_nonoverlapping_memory(&mut tmp, src, 1); @@ -213,7 +215,8 @@ pub unsafe fn read(src: *const T) -> T { /// /// This is unsafe for the same reasons that `read` is unsafe. #[inline(always)] -#[unstable = "may play a larger role in std::ptr future extensions"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "may play a larger role in std::ptr future extensions")] pub unsafe fn read_and_zero(dest: *mut T) -> T { // Copy the data out from `dest`: let tmp = read(&*dest); @@ -236,18 +239,18 @@ pub unsafe fn read_and_zero(dest: *mut T) -> T { /// This is appropriate for initializing uninitialized memory, or overwriting /// memory that has previously been `read` from. #[inline] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub unsafe fn write(dst: *mut T, src: T) { intrinsics::move_val_init(&mut *dst, src) } /// Methods on raw pointers -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub trait PtrExt: Sized { type Target; /// Returns true if the pointer is null. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn is_null(self) -> bool; /// Returns `None` if the pointer is null, or else returns a reference to @@ -259,8 +262,9 @@ pub trait PtrExt: Sized { /// null-safety, it is important to note that this is still an unsafe /// operation because the returned value could be pointing to invalid /// memory. - #[unstable = "Option is not clearly the right return type, and we may want \ - to tie the return lifetime to a borrow of the raw pointer"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "Option is not clearly the right return type, and we may want \ + to tie the return lifetime to a borrow of the raw pointer")] unsafe fn as_ref<'a>(&self) -> Option<&'a Self::Target>; /// Calculates the offset from a pointer. `count` is in units of T; e.g. a @@ -271,12 +275,12 @@ pub trait PtrExt: Sized { /// The offset must be in-bounds of the object, or one-byte-past-the-end. /// Otherwise `offset` invokes Undefined Behaviour, regardless of whether /// the pointer is used. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] unsafe fn offset(self, count: int) -> Self; } /// Methods on mutable raw pointers -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub trait MutPtrExt { type Target; @@ -287,28 +291,30 @@ pub trait MutPtrExt { /// /// As with `as_ref`, this is unsafe because it cannot verify the validity /// of the returned pointer. - #[unstable = "Option is not clearly the right return type, and we may want \ - to tie the return lifetime to a borrow of the raw pointer"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "Option is not clearly the right return type, and we may want \ + to tie the return lifetime to a borrow of the raw pointer")] unsafe fn as_mut<'a>(&self) -> Option<&'a mut Self::Target>; } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl PtrExt for *const T { type Target = T; #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn is_null(self) -> bool { self as uint == 0 } #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] unsafe fn offset(self, count: int) -> *const T { intrinsics::offset(self, count) } #[inline] - #[unstable = "return value does not necessarily convey all possible \ - information"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "return value does not necessarily convey all possible \ + information")] unsafe fn as_ref<'a>(&self) -> Option<&'a T> { if self.is_null() { None @@ -318,23 +324,24 @@ impl PtrExt for *const T { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl PtrExt for *mut T { type Target = T; #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn is_null(self) -> bool { self as uint == 0 } #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] unsafe fn offset(self, count: int) -> *mut T { intrinsics::offset(self, count) as *mut T } #[inline] - #[unstable = "return value does not necessarily convey all possible \ - information"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "return value does not necessarily convey all possible \ + information")] unsafe fn as_ref<'a>(&self) -> Option<&'a T> { if self.is_null() { None @@ -344,13 +351,14 @@ impl PtrExt for *mut T { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl MutPtrExt for *mut T { type Target = T; #[inline] - #[unstable = "return value does not necessarily convey all possible \ - information"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "return value does not necessarily convey all possible \ + information")] unsafe fn as_mut<'a>(&self) -> Option<&'a mut T> { if self.is_null() { None @@ -361,7 +369,7 @@ impl MutPtrExt for *mut T { } // Equality for pointers -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl PartialEq for *const T { #[inline] fn eq(&self, other: &*const T) -> bool { @@ -371,10 +379,10 @@ impl PartialEq for *const T { fn ne(&self, other: &*const T) -> bool { !self.eq(other) } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Eq for *const T {} -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl PartialEq for *mut T { #[inline] fn eq(&self, other: &*mut T) -> bool { @@ -384,10 +392,10 @@ impl PartialEq for *mut T { fn ne(&self, other: &*mut T) -> bool { !self.eq(other) } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Eq for *mut T {} -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Clone for *const T { #[inline] fn clone(&self) -> *const T { @@ -395,7 +403,7 @@ impl Clone for *const T { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Clone for *mut T { #[inline] fn clone(&self) -> *mut T { @@ -408,7 +416,7 @@ mod externfnpointers { use mem; use cmp::PartialEq; - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl<_R> PartialEq for extern "C" fn() -> _R { #[inline] fn eq(&self, other: &extern "C" fn() -> _R) -> bool { @@ -419,7 +427,7 @@ mod externfnpointers { } macro_rules! fnptreq { ($($p:ident),*) => { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl<_R,$($p),*> PartialEq for extern "C" fn($($p),*) -> _R { #[inline] fn eq(&self, other: &extern "C" fn($($p),*) -> _R) -> bool { @@ -439,7 +447,7 @@ mod externfnpointers { } // Comparison for pointers -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Ord for *const T { #[inline] fn cmp(&self, other: &*const T) -> Ordering { @@ -453,7 +461,7 @@ impl Ord for *const T { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl PartialOrd for *const T { #[inline] fn partial_cmp(&self, other: &*const T) -> Option { @@ -473,7 +481,7 @@ impl PartialOrd for *const T { fn ge(&self, other: &*const T) -> bool { *self >= *other } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Ord for *mut T { #[inline] fn cmp(&self, other: &*mut T) -> Ordering { @@ -487,7 +495,7 @@ impl Ord for *mut T { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl PartialOrd for *mut T { #[inline] fn partial_cmp(&self, other: &*mut T) -> Option { @@ -513,32 +521,34 @@ impl PartialOrd for *mut T { /// raw `*mut T` (which conveys no particular ownership semantics). /// Useful for building abstractions like `Vec` or `Box`, which /// internally use raw pointers to manage the memory that they own. -#[unstable = "recently added to this module"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "recently added to this module")] pub struct Unique(pub *mut T); /// `Unique` pointers are `Send` if `T` is `Send` because the data they /// reference is unaliased. Note that this aliasing invariant is /// unenforced by the type system; the abstraction using the /// `Unique` must enforce it. -#[unstable = "recently added to this module"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "recently added to this module")] unsafe impl Send for Unique { } /// `Unique` pointers are `Sync` if `T` is `Sync` because the data they /// reference is unaliased. Note that this aliasing invariant is /// unenforced by the type system; the abstraction using the /// `Unique` must enforce it. -#[unstable = "recently added to this module"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "recently added to this module")] unsafe impl Sync for Unique { } impl Unique { /// Returns a null Unique. - #[unstable = "recently added to this module"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "recently added to this module")] pub fn null() -> Unique { Unique(null_mut()) } /// Return an (unsafe) pointer into the memory owned by `self`. - #[unstable = "recently added to this module"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "recently added to this module")] pub unsafe fn offset(self, offset: int) -> *mut T { self.0.offset(offset) } diff --git a/src/libcore/raw.rs b/src/libcore/raw.rs index 13a387c7cb0..4b4b493bad2 100644 --- a/src/libcore/raw.rs +++ b/src/libcore/raw.rs @@ -9,7 +9,7 @@ // except according to those terms. #![allow(missing_docs)] -#![unstable] +#![unstable(feature = "unnamed_feature", since = "1.0.0")] //! Contains struct definitions for the layout of compiler built-in types. //! diff --git a/src/libcore/result.rs b/src/libcore/result.rs index 1ab810f937d..a1a7ddcde57 100644 --- a/src/libcore/result.rs +++ b/src/libcore/result.rs @@ -224,7 +224,7 @@ //! //! `try!` is imported by the prelude, and is available everywhere. -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] use self::Result::{Ok, Err}; @@ -241,14 +241,14 @@ use slice; /// See the [`std::result`](index.html) module documentation for details. #[derive(Clone, Copy, PartialEq, PartialOrd, Eq, Ord, Show, Hash)] #[must_use] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub enum Result { /// Contains the success value - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] Ok(T), /// Contains the error value - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] Err(E) } @@ -256,7 +256,7 @@ pub enum Result { // Type implementation ///////////////////////////////////////////////////////////////////////////// -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Result { ///////////////////////////////////////////////////////////////////////// // Querying the contained values @@ -274,7 +274,7 @@ impl Result { /// assert_eq!(x.is_ok(), false); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn is_ok(&self) -> bool { match *self { Ok(_) => true, @@ -294,7 +294,7 @@ impl Result { /// assert_eq!(x.is_err(), true); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn is_err(&self) -> bool { !self.is_ok() } @@ -318,7 +318,7 @@ impl Result { /// assert_eq!(x.ok(), None); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn ok(self) -> Option { match self { Ok(x) => Some(x), @@ -341,7 +341,7 @@ impl Result { /// assert_eq!(x.err(), Some("Nothing here")); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn err(self) -> Option { match self { Ok(_) => None, @@ -366,7 +366,7 @@ impl Result { /// assert_eq!(x.as_ref(), Err(&"Error")); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn as_ref(&self) -> Result<&T, &E> { match *self { Ok(ref x) => Ok(x), @@ -393,7 +393,7 @@ impl Result { /// assert_eq!(x.unwrap_err(), 0); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn as_mut(&mut self) -> Result<&mut T, &mut E> { match *self { Ok(ref mut x) => Ok(x), @@ -417,7 +417,8 @@ impl Result { /// assert!(x.as_mut_slice().is_empty()); /// ``` #[inline] - #[unstable = "waiting for mut conventions"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "waiting for mut conventions")] pub fn as_mut_slice(&mut self) -> &mut [T] { match *self { Ok(ref mut x) => slice::mut_ref_slice(x), @@ -463,7 +464,7 @@ impl Result { /// assert!(sum == 10); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn map U>(self, op: F) -> Result { match self { Ok(t) => Ok(op(t)), @@ -489,7 +490,7 @@ impl Result { /// assert_eq!(x.map_err(stringify), Err("error code: 13".to_string())); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn map_err F>(self, op: O) -> Result { match self { Ok(t) => Ok(t), @@ -513,7 +514,7 @@ impl Result { /// assert_eq!(x.iter().next(), None); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn iter(&self) -> Iter { Iter { inner: self.as_ref().ok() } } @@ -534,7 +535,7 @@ impl Result { /// assert_eq!(x.iter_mut().next(), None); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn iter_mut(&mut self) -> IterMut { IterMut { inner: self.as_mut().ok() } } @@ -553,7 +554,7 @@ impl Result { /// assert_eq!(v, vec![]); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn into_iter(self) -> IntoIter { IntoIter { inner: self.ok() } } @@ -584,7 +585,7 @@ impl Result { /// assert_eq!(x.and(y), Ok("different result type")); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn and(self, res: Result) -> Result { match self { Ok(_) => res, @@ -608,7 +609,7 @@ impl Result { /// assert_eq!(Err(3).and_then(sq).and_then(sq), Err(3)); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn and_then Result>(self, op: F) -> Result { match self { Ok(t) => op(t), @@ -638,7 +639,7 @@ impl Result { /// assert_eq!(x.or(y), Ok(2)); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn or(self, res: Result) -> Result { match self { Ok(_) => self, @@ -662,7 +663,7 @@ impl Result { /// assert_eq!(Err(3).or_else(err).or_else(err), Err(3)); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn or_else Result>(self, op: O) -> Result { match self { Ok(t) => Ok(t), @@ -684,7 +685,7 @@ impl Result { /// assert_eq!(x.unwrap_or(optb), optb); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn unwrap_or(self, optb: T) -> T { match self { Ok(t) => t, @@ -704,7 +705,7 @@ impl Result { /// assert_eq!(Err("foo").unwrap_or_else(count), 3u); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn unwrap_or_else T>(self, op: F) -> T { match self { Ok(t) => t, @@ -713,7 +714,7 @@ impl Result { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Result { /// Unwraps a result, yielding the content of an `Ok`. /// @@ -734,7 +735,7 @@ impl Result { /// x.unwrap(); // panics with `emergency failure` /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn unwrap(self) -> T { match self { Ok(t) => t, @@ -744,7 +745,7 @@ impl Result { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Result { /// Unwraps a result, yielding the content of an `Err`. /// @@ -765,7 +766,7 @@ impl Result { /// assert_eq!(x.unwrap_err(), "emergency failure"); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn unwrap_err(self) -> E { match self { Ok(t) => @@ -782,7 +783,7 @@ impl Result { impl AsSlice for Result { /// Convert from `Result` to `&[T]` (without copying) #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn as_slice<'a>(&'a self) -> &'a [T] { match *self { Ok(ref x) => slice::ref_slice(x), @@ -800,10 +801,10 @@ impl AsSlice for Result { ///////////////////////////////////////////////////////////////////////////// /// An iterator over a reference to the `Ok` variant of a `Result`. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Iter<'a, T: 'a> { inner: Option<&'a T> } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T> Iterator for Iter<'a, T> { type Item = &'a T; @@ -816,13 +817,13 @@ impl<'a, T> Iterator for Iter<'a, T> { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T> DoubleEndedIterator for Iter<'a, T> { #[inline] fn next_back(&mut self) -> Option<&'a T> { self.inner.take() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T> ExactSizeIterator for Iter<'a, T> {} impl<'a, T> Clone for Iter<'a, T> { @@ -830,10 +831,10 @@ impl<'a, T> Clone for Iter<'a, T> { } /// An iterator over a mutable reference to the `Ok` variant of a `Result`. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct IterMut<'a, T: 'a> { inner: Option<&'a mut T> } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T> Iterator for IterMut<'a, T> { type Item = &'a mut T; @@ -846,20 +847,20 @@ impl<'a, T> Iterator for IterMut<'a, T> { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T> DoubleEndedIterator for IterMut<'a, T> { #[inline] fn next_back(&mut self) -> Option<&'a mut T> { self.inner.take() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T> ExactSizeIterator for IterMut<'a, T> {} /// An iterator over the value in a `Ok` variant of a `Result`. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct IntoIter { inner: Option } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Iterator for IntoIter { type Item = T; @@ -872,20 +873,20 @@ impl Iterator for IntoIter { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl DoubleEndedIterator for IntoIter { #[inline] fn next_back(&mut self) -> Option { self.inner.take() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl ExactSizeIterator for IntoIter {} ///////////////////////////////////////////////////////////////////////////// // FromIterator ///////////////////////////////////////////////////////////////////////////// -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl> FromIterator> for Result { /// Takes each element in the `Iterator`: if it is an `Err`, no further /// elements are taken, and the `Err` is returned. Should no `Err` occur, a @@ -949,7 +950,7 @@ impl> FromIterator> for Result { /// If an `Err` is encountered, it is immediately returned. /// Otherwise, the folded value is returned. #[inline] -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn fold uint where Self::Item: Clone; } -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] impl SliceExt for [T] { type Item = T; @@ -258,7 +258,7 @@ impl SliceExt for [T] { self.repr().data } - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] fn binary_search_by(&self, mut f: F) -> Result where F: FnMut(&T) -> Ordering { @@ -452,12 +452,12 @@ impl SliceExt for [T] { m >= n && needle == &self[(m-n)..] } - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] fn binary_search(&self, x: &T) -> Result where T: Ord { self.binary_search_by(|p| p.cmp(x)) } - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] fn next_permutation(&mut self) -> bool where T: Ord { // These cases only have 1 permutation each, so we can't do anything. if self.len() < 2 { return false; } @@ -488,7 +488,7 @@ impl SliceExt for [T] { true } - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] fn prev_permutation(&mut self) -> bool where T: Ord { // These cases only have 1 permutation each, so we can't do anything. if self.len() < 2 { return false; } @@ -630,33 +630,34 @@ impl ops::IndexMut for [T] { //////////////////////////////////////////////////////////////////////////////// /// Data that is viewable as a slice. -#[unstable = "will be replaced by slice syntax"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "will be replaced by slice syntax")] pub trait AsSlice { /// Work with `self` as a slice. fn as_slice<'a>(&'a self) -> &'a [T]; } -#[unstable = "trait is experimental"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "trait is experimental")] impl AsSlice for [T] { #[inline(always)] fn as_slice<'a>(&'a self) -> &'a [T] { self } } -#[unstable = "trait is experimental"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "trait is experimental")] impl<'a, T, U: ?Sized + AsSlice> AsSlice for &'a U { #[inline(always)] fn as_slice(&self) -> &[T] { AsSlice::as_slice(*self) } } -#[unstable = "trait is experimental"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "trait is experimental")] impl<'a, T, U: ?Sized + AsSlice> AsSlice for &'a mut U { #[inline(always)] fn as_slice(&self) -> &[T] { AsSlice::as_slice(*self) } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T> Default for &'a [T] { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn default() -> &'a [T] { &[] } } @@ -667,7 +668,7 @@ impl<'a, T> Default for &'a [T] { // The shared definition of the `Iter` and `IterMut` iterators macro_rules! iterator { (struct $name:ident -> $ptr:ty, $elem:ty) => { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T> Iterator for $name<'a, T> { type Item = $elem; @@ -705,7 +706,7 @@ macro_rules! iterator { } } - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T> DoubleEndedIterator for $name<'a, T> { #[inline] fn next_back(&mut self) -> Option<$elem> { @@ -747,14 +748,14 @@ macro_rules! make_slice { } /// Immutable slice iterator -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Iter<'a, T: 'a> { ptr: *const T, end: *const T, marker: marker::ContravariantLifetime<'a> } -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] impl<'a, T> ops::Index> for Iter<'a, T> { type Output = [T]; #[inline] @@ -763,7 +764,7 @@ impl<'a, T> ops::Index> for Iter<'a, T> { } } -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] impl<'a, T> ops::Index> for Iter<'a, T> { type Output = [T]; #[inline] @@ -772,7 +773,7 @@ impl<'a, T> ops::Index> for Iter<'a, T> { } } -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] impl<'a, T> ops::Index> for Iter<'a, T> { type Output = [T]; #[inline] @@ -781,7 +782,7 @@ impl<'a, T> ops::Index> for Iter<'a, T> { } } -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] impl<'a, T> ops::Index for Iter<'a, T> { type Output = [T]; #[inline] @@ -795,7 +796,7 @@ impl<'a, T> Iter<'a, T> { /// /// This has the same lifetime as the original slice, and so the /// iterator can continue to be used while this exists. - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn as_slice(&self) -> &'a [T] { make_slice!(T => &'a [T]: self.ptr, self.end) } @@ -805,15 +806,15 @@ impl<'a,T> Copy for Iter<'a,T> {} iterator!{struct Iter -> *const T, &'a T} -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T> ExactSizeIterator for Iter<'a, T> {} -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T> Clone for Iter<'a, T> { fn clone(&self) -> Iter<'a, T> { *self } } -#[unstable = "trait is experimental"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "trait is experimental")] impl<'a, T> RandomAccessIterator for Iter<'a, T> { #[inline] fn indexable(&self) -> uint { @@ -839,7 +840,7 @@ impl<'a, T> RandomAccessIterator for Iter<'a, T> { } /// Mutable slice iterator. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct IterMut<'a, T: 'a> { ptr: *mut T, end: *mut T, @@ -847,7 +848,7 @@ pub struct IterMut<'a, T: 'a> { } -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] impl<'a, T> ops::Index> for IterMut<'a, T> { type Output = [T]; #[inline] @@ -855,7 +856,7 @@ impl<'a, T> ops::Index> for IterMut<'a, T> { self.index(&ops::FullRange).index(index) } } -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] impl<'a, T> ops::Index> for IterMut<'a, T> { type Output = [T]; #[inline] @@ -863,7 +864,7 @@ impl<'a, T> ops::Index> for IterMut<'a, T> { self.index(&ops::FullRange).index(index) } } -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] impl<'a, T> ops::Index> for IterMut<'a, T> { type Output = [T]; #[inline] @@ -871,7 +872,7 @@ impl<'a, T> ops::Index> for IterMut<'a, T> { self.index(&ops::FullRange).index(index) } } -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] impl<'a, T> ops::Index for IterMut<'a, T> { type Output = [T]; #[inline] @@ -880,7 +881,7 @@ impl<'a, T> ops::Index for IterMut<'a, T> { } } -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] impl<'a, T> ops::IndexMut> for IterMut<'a, T> { type Output = [T]; #[inline] @@ -888,7 +889,7 @@ impl<'a, T> ops::IndexMut> for IterMut<'a, T> { self.index_mut(&ops::FullRange).index_mut(index) } } -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] impl<'a, T> ops::IndexMut> for IterMut<'a, T> { type Output = [T]; #[inline] @@ -896,7 +897,7 @@ impl<'a, T> ops::IndexMut> for IterMut<'a, T> { self.index_mut(&ops::FullRange).index_mut(index) } } -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] impl<'a, T> ops::IndexMut> for IterMut<'a, T> { type Output = [T]; #[inline] @@ -904,7 +905,7 @@ impl<'a, T> ops::IndexMut> for IterMut<'a, T> { self.index_mut(&ops::FullRange).index_mut(index) } } -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] impl<'a, T> ops::IndexMut for IterMut<'a, T> { type Output = [T]; #[inline] @@ -921,7 +922,7 @@ impl<'a, T> IterMut<'a, T> { /// to consume the iterator. Consider using the `Slice` and /// `SliceMut` implementations for obtaining slices with more /// restricted lifetimes that do not consume the iterator. - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn into_slice(self) -> &'a mut [T] { make_slice!(T => &'a mut [T]: self.ptr, self.end) } @@ -929,7 +930,7 @@ impl<'a, T> IterMut<'a, T> { iterator!{struct IterMut -> *mut T, &'a mut T} -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T> ExactSizeIterator for IterMut<'a, T> {} /// An internal abstraction over the splitting iterators, so that @@ -942,7 +943,7 @@ trait SplitIter: DoubleEndedIterator { /// An iterator over subslices separated by elements that match a predicate /// function. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Split<'a, T:'a, P> where P: FnMut(&T) -> bool { v: &'a [T], pred: P, @@ -950,7 +951,7 @@ pub struct Split<'a, T:'a, P> where P: FnMut(&T) -> bool { } // FIXME(#19839) Remove in favor of `#[derive(Clone)]` -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T, P> Clone for Split<'a, T, P> where P: Clone + FnMut(&T) -> bool { fn clone(&self) -> Split<'a, T, P> { Split { @@ -961,7 +962,7 @@ impl<'a, T, P> Clone for Split<'a, T, P> where P: Clone + FnMut(&T) -> bool { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T, P> Iterator for Split<'a, T, P> where P: FnMut(&T) -> bool { type Item = &'a [T]; @@ -989,7 +990,7 @@ impl<'a, T, P> Iterator for Split<'a, T, P> where P: FnMut(&T) -> bool { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T, P> DoubleEndedIterator for Split<'a, T, P> where P: FnMut(&T) -> bool { #[inline] fn next_back(&mut self) -> Option<&'a [T]> { @@ -1015,7 +1016,7 @@ impl<'a, T, P> SplitIter for Split<'a, T, P> where P: FnMut(&T) -> bool { /// An iterator over the subslices of the vector which are separated /// by elements that match `pred`. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct SplitMut<'a, T:'a, P> where P: FnMut(&T) -> bool { v: &'a mut [T], pred: P, @@ -1034,7 +1035,7 @@ impl<'a, T, P> SplitIter for SplitMut<'a, T, P> where P: FnMut(&T) -> bool { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T, P> Iterator for SplitMut<'a, T, P> where P: FnMut(&T) -> bool { type Item = &'a mut [T]; @@ -1069,7 +1070,7 @@ impl<'a, T, P> Iterator for SplitMut<'a, T, P> where P: FnMut(&T) -> bool { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T, P> DoubleEndedIterator for SplitMut<'a, T, P> where P: FnMut(&T) -> bool, { @@ -1124,7 +1125,7 @@ impl> Iterator for GenericSplitN { /// An iterator over subslices separated by elements that match a predicate /// function, limited to a given number of splits. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct SplitN<'a, T: 'a, P> where P: FnMut(&T) -> bool { inner: GenericSplitN> } @@ -1132,14 +1133,14 @@ pub struct SplitN<'a, T: 'a, P> where P: FnMut(&T) -> bool { /// An iterator over subslices separated by elements that match a /// predicate function, limited to a given number of splits, starting /// from the end of the slice. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct RSplitN<'a, T: 'a, P> where P: FnMut(&T) -> bool { inner: GenericSplitN> } /// An iterator over subslices separated by elements that match a predicate /// function, limited to a given number of splits. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct SplitNMut<'a, T: 'a, P> where P: FnMut(&T) -> bool { inner: GenericSplitN> } @@ -1147,14 +1148,14 @@ pub struct SplitNMut<'a, T: 'a, P> where P: FnMut(&T) -> bool { /// An iterator over subslices separated by elements that match a /// predicate function, limited to a given number of splits, starting /// from the end of the slice. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct RSplitNMut<'a, T: 'a, P> where P: FnMut(&T) -> bool { inner: GenericSplitN> } macro_rules! forward_iterator { ($name:ident: $elem:ident, $iter_of:ty) => { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, $elem, P> Iterator for $name<'a, $elem, P> where P: FnMut(&T) -> bool { @@ -1180,13 +1181,13 @@ forward_iterator! { RSplitNMut: T, &'a mut [T] } /// An iterator over overlapping subslices of length `size`. #[derive(Clone)] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Windows<'a, T:'a> { v: &'a [T], size: uint } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T> Iterator for Windows<'a, T> { type Item = &'a [T]; @@ -1218,13 +1219,13 @@ impl<'a, T> Iterator for Windows<'a, T> { /// When the slice len is not evenly divided by the chunk size, the last slice /// of the iteration will be the remainder. #[derive(Clone)] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Chunks<'a, T:'a> { v: &'a [T], size: uint } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T> Iterator for Chunks<'a, T> { type Item = &'a [T]; @@ -1253,7 +1254,7 @@ impl<'a, T> Iterator for Chunks<'a, T> { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T> DoubleEndedIterator for Chunks<'a, T> { #[inline] fn next_back(&mut self) -> Option<&'a [T]> { @@ -1269,7 +1270,7 @@ impl<'a, T> DoubleEndedIterator for Chunks<'a, T> { } } -#[unstable = "trait is experimental"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "trait is experimental")] impl<'a, T> RandomAccessIterator for Chunks<'a, T> { #[inline] fn indexable(&self) -> uint { @@ -1293,13 +1294,13 @@ impl<'a, T> RandomAccessIterator for Chunks<'a, T> { /// An iterator over a slice in (non-overlapping) mutable chunks (`size` /// elements at a time). When the slice len is not evenly divided by the chunk /// size, the last slice of the iteration will be the remainder. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct ChunksMut<'a, T:'a> { v: &'a mut [T], chunk_size: uint } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T> Iterator for ChunksMut<'a, T> { type Item = &'a mut [T]; @@ -1329,7 +1330,7 @@ impl<'a, T> Iterator for ChunksMut<'a, T> { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T> DoubleEndedIterator for ChunksMut<'a, T> { #[inline] fn next_back(&mut self) -> Option<&'a mut [T]> { @@ -1353,7 +1354,7 @@ impl<'a, T> DoubleEndedIterator for ChunksMut<'a, T> { // /// Converts a pointer to A into a slice of length 1 (without copying). -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn ref_slice<'a, A>(s: &'a A) -> &'a [A] { unsafe { transmute(RawSlice { data: s, len: 1 }) @@ -1361,7 +1362,7 @@ pub fn ref_slice<'a, A>(s: &'a A) -> &'a [A] { } /// Converts a pointer to A into a slice of length 1 (without copying). -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn mut_ref_slice<'a, A>(s: &'a mut A) -> &'a mut [A] { unsafe { let ptr: *const A = transmute(s); @@ -1395,7 +1396,8 @@ pub fn mut_ref_slice<'a, A>(s: &'a mut A) -> &'a mut [A] { /// } /// ``` #[inline] -#[unstable = "should be renamed to from_raw_parts"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "should be renamed to from_raw_parts")] pub unsafe fn from_raw_buf<'a, T>(p: &'a *const T, len: uint) -> &'a [T] { transmute(RawSlice { data: *p, len: len }) } @@ -1407,7 +1409,8 @@ pub unsafe fn from_raw_buf<'a, T>(p: &'a *const T, len: uint) -> &'a [T] { /// not being able to provide a non-aliasing guarantee of the returned mutable /// slice. #[inline] -#[unstable = "should be renamed to from_raw_parts_mut"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "should be renamed to from_raw_parts_mut")] pub unsafe fn from_raw_mut_buf<'a, T>(p: &'a *mut T, len: uint) -> &'a mut [T] { transmute(RawSlice { data: *p, len: len }) } @@ -1417,7 +1420,7 @@ pub unsafe fn from_raw_mut_buf<'a, T>(p: &'a *mut T, len: uint) -> &'a mut [T] { // /// Operations on `[u8]`. -#[unstable = "needs review"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "needs review")] pub mod bytes { use ptr; use slice::SliceExt; @@ -1459,7 +1462,7 @@ pub mod bytes { // Boilerplate traits // -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl PartialEq<[B]> for [A] where A: PartialEq { fn eq(&self, other: &[B]) -> bool { self.len() == other.len() && @@ -1471,17 +1474,17 @@ impl PartialEq<[B]> for [A] where A: PartialEq { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Eq for [T] {} -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Ord for [T] { fn cmp(&self, other: &[T]) -> Ordering { order::cmp(self.iter(), other.iter()) } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl PartialOrd for [T] { #[inline] fn partial_cmp(&self, other: &[T]) -> Option { @@ -1506,7 +1509,7 @@ impl PartialOrd for [T] { } /// Extension methods for slices containing integers. -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] pub trait IntSliceExt { /// Converts the slice to an immutable slice of unsigned integers with the same width. fn as_unsigned<'a>(&'a self) -> &'a [U]; @@ -1521,7 +1524,7 @@ pub trait IntSliceExt { macro_rules! impl_int_slice { ($u:ty, $s:ty, $t:ty) => { - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] impl IntSliceExt<$u, $s> for [$t] { #[inline] fn as_unsigned(&self) -> &[$u] { unsafe { transmute(self) } } diff --git a/src/libcore/str/mod.rs b/src/libcore/str/mod.rs index 6a542b2c458..c2f9e764a9f 100644 --- a/src/libcore/str/mod.rs +++ b/src/libcore/str/mod.rs @@ -45,7 +45,7 @@ macro_rules! delegate_iter { } }; ($te:ty : $ti:ty) => { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl<'a> Iterator for $ti { type Item = $te; @@ -58,7 +58,7 @@ macro_rules! delegate_iter { self.0.size_hint() } } - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl<'a> DoubleEndedIterator for $ti { #[inline] fn next_back(&mut self) -> Option<$te> { @@ -67,7 +67,7 @@ macro_rules! delegate_iter { } }; (pattern $te:ty : $ti:ty) => { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, P: CharEq> Iterator for $ti { type Item = $te; @@ -80,7 +80,7 @@ macro_rules! delegate_iter { self.0.size_hint() } } - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, P: CharEq> DoubleEndedIterator for $ti { #[inline] fn next_back(&mut self) -> Option<$te> { @@ -89,7 +89,7 @@ macro_rules! delegate_iter { } }; (pattern forward $te:ty : $ti:ty) => { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, P: CharEq> Iterator for $ti { type Item = $te; @@ -108,7 +108,8 @@ macro_rules! delegate_iter { /// A trait to abstract the idea of creating a new instance of a type from a /// string. // FIXME(#17307): there should be an `E` associated type for a `Result` return -#[unstable = "will return a Result once associated types are working"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "will return a Result once associated types are working")] pub trait FromStr { /// Parses a string `s` to return an optional value of this type. If the /// string is ill-formatted, the None is returned. @@ -143,7 +144,8 @@ Section: Creating a string /// Errors which can occur when attempting to interpret a byte slice as a `str`. #[derive(Copy, Eq, PartialEq, Clone, Show)] -#[unstable = "error enumeration recently added and definitions may be refined"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "error enumeration recently added and definitions may be refined")] pub enum Utf8Error { /// An invalid byte was detected at the byte offset given. /// @@ -167,7 +169,7 @@ pub enum Utf8Error { /// /// Returns `Err` if the slice is not utf-8 with a description as to why the /// provided slice is not utf-8. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub fn from_utf8(v: &[u8]) -> Result<&str, Utf8Error> { try!(run_utf8_validation_iterator(&mut v.iter())); Ok(unsafe { from_utf8_unchecked(v) }) @@ -175,7 +177,7 @@ pub fn from_utf8(v: &[u8]) -> Result<&str, Utf8Error> { /// Converts a slice of bytes to a string slice without checking /// that the string contains valid UTF-8. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub unsafe fn from_utf8_unchecked<'a>(v: &'a [u8]) -> &'a str { mem::transmute(v) } @@ -193,7 +195,8 @@ pub unsafe fn from_utf8_unchecked<'a>(v: &'a [u8]) -> &'a str { /// # Panics /// /// This function will panic if the string pointed to by `s` is not valid UTF-8. -#[deprecated = "use std::ffi::c_str_to_bytes + str::from_utf8"] +#[deprecated(feature = "oldstuff", since = "1.0.0", + reason = "use std::ffi::c_str_to_bytes + str::from_utf8")] pub unsafe fn from_c_str(s: *const i8) -> &'static str { let s = s as *const u8; let mut len = 0u; @@ -205,7 +208,8 @@ pub unsafe fn from_c_str(s: *const i8) -> &'static str { } /// Something that can be used to compare against a character -#[unstable = "definition may change as pattern-related methods are stabilized"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "definition may change as pattern-related methods are stabilized")] pub trait CharEq { /// Determine if the splitter should split at the given character fn matches(&mut self, char) -> bool; @@ -250,7 +254,7 @@ Section: Iterators /// /// Created with the method `.chars()`. #[derive(Clone, Copy)] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Chars<'a> { iter: slice::Iter<'a, u8> } @@ -279,7 +283,7 @@ fn unwrap_or_0(opt: Option<&u8>) -> u8 { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a> Iterator for Chars<'a> { type Item = char; @@ -325,7 +329,7 @@ impl<'a> Iterator for Chars<'a> { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a> DoubleEndedIterator for Chars<'a> { #[inline] fn next_back(&mut self) -> Option { @@ -362,13 +366,13 @@ impl<'a> DoubleEndedIterator for Chars<'a> { /// External iterator for a string's characters and their byte offsets. /// Use with the `std::iter` module. #[derive(Clone)] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct CharIndices<'a> { front_offset: uint, iter: Chars<'a>, } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a> Iterator for CharIndices<'a> { type Item = (uint, char); @@ -392,7 +396,7 @@ impl<'a> Iterator for CharIndices<'a> { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a> DoubleEndedIterator for CharIndices<'a> { #[inline] fn next_back(&mut self) -> Option<(uint, char)> { @@ -411,7 +415,7 @@ impl<'a> DoubleEndedIterator for CharIndices<'a> { /// Use with the `std::iter` module. /// /// Created with `StrExt::bytes` -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] #[derive(Clone)] pub struct Bytes<'a>(Map<&'a u8, u8, slice::Iter<'a, u8>, BytesDeref>); delegate_iter!{exact u8 : Bytes<'a>} @@ -451,13 +455,13 @@ struct CharSplitsN<'a, Sep> { } /// An iterator over the lines of a string, separated by `\n`. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Lines<'a> { inner: CharSplits<'a, char>, } /// An iterator over the lines of a string, separated by either `\n` or (`\r\n`). -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct LinesAny<'a> { inner: Map<&'a str, &'a str, Lines<'a>, fn(&str) -> &str>, } @@ -474,7 +478,7 @@ impl<'a, Sep> CharSplits<'a, Sep> { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, Sep: CharEq> Iterator for CharSplits<'a, Sep> { type Item = &'a str; @@ -509,7 +513,7 @@ impl<'a, Sep: CharEq> Iterator for CharSplits<'a, Sep> { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, Sep: CharEq> DoubleEndedIterator for CharSplits<'a, Sep> { #[inline] fn next_back(&mut self) -> Option<&'a str> { @@ -551,7 +555,7 @@ impl<'a, Sep: CharEq> DoubleEndedIterator for CharSplits<'a, Sep> { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, Sep: CharEq> Iterator for CharSplitsN<'a, Sep> { type Item = &'a str; @@ -857,7 +861,7 @@ impl Searcher { /// An iterator over the start and end indices of the matches of a /// substring within a larger string #[derive(Clone)] -#[unstable = "type may be removed"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "type may be removed")] pub struct MatchIndices<'a> { // constants haystack: &'a str, @@ -868,14 +872,14 @@ pub struct MatchIndices<'a> { /// An iterator over the substrings of a string separated by a given /// search string #[derive(Clone)] -#[unstable = "type may be removed"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "type may be removed")] pub struct SplitStr<'a> { it: MatchIndices<'a>, last_end: uint, finished: bool } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a> Iterator for MatchIndices<'a> { type Item = (uint, uint); @@ -892,7 +896,7 @@ impl<'a> Iterator for MatchIndices<'a> { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a> Iterator for SplitStr<'a> { type Item = &'a str; @@ -1052,7 +1056,8 @@ static UTF8_CHAR_WIDTH: [u8; 256] = [ /// the next `char` in a string. This can be used as a data structure /// for iterating over the UTF-8 bytes of a string. #[derive(Copy)] -#[unstable = "naming is uncertain with container conventions"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "naming is uncertain with container conventions")] pub struct CharRange { /// Current `char` pub ch: char, @@ -1078,7 +1083,7 @@ mod traits { use ops; use str::{StrExt, eq_slice}; - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl Ord for str { #[inline] fn cmp(&self, other: &str) -> Ordering { @@ -1094,7 +1099,7 @@ mod traits { } } - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl PartialEq for str { #[inline] fn eq(&self, other: &str) -> bool { @@ -1104,10 +1109,10 @@ mod traits { fn ne(&self, other: &str) -> bool { !(*self).eq(other) } } - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl Eq for str {} - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl PartialOrd for str { #[inline] fn partial_cmp(&self, other: &str) -> Option { @@ -1146,9 +1151,10 @@ mod traits { } /// Any string that can be represented as a slice -#[unstable = "Instead of taking this bound generically, this trait will be \ - replaced with one of slicing syntax, deref coercions, or \ - a more generic conversion trait"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "Instead of taking this bound generically, this trait will be \ + replaced with one of slicing syntax, deref coercions, or \ + a more generic conversion trait")] pub trait Str { /// Work with `self` as a slice. fn as_slice<'a>(&'a self) -> &'a str; @@ -1166,25 +1172,26 @@ impl<'a, S: ?Sized> Str for &'a S where S: Str { /// Return type of `StrExt::split` #[derive(Clone)] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Split<'a, P>(CharSplits<'a, P>); delegate_iter!{pattern &'a str : Split<'a, P>} /// Return type of `StrExt::split_terminator` #[derive(Clone)] -#[unstable = "might get removed in favour of a constructor method on Split"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "might get removed in favour of a constructor method on Split")] pub struct SplitTerminator<'a, P>(CharSplits<'a, P>); delegate_iter!{pattern &'a str : SplitTerminator<'a, P>} /// Return type of `StrExt::splitn` #[derive(Clone)] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct SplitN<'a, P>(CharSplitsN<'a, P>); delegate_iter!{pattern forward &'a str : SplitN<'a, P>} /// Return type of `StrExt::rsplitn` #[derive(Clone)] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct RSplitN<'a, P>(CharSplitsN<'a, P>); delegate_iter!{pattern forward &'a str : RSplitN<'a, P>} @@ -1599,13 +1606,13 @@ impl StrExt for str { fn parse(&self) -> Option { FromStr::from_str(self) } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a> Default for &'a str { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn default() -> &'a str { "" } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a> Iterator for Lines<'a> { type Item = &'a str; @@ -1615,13 +1622,13 @@ impl<'a> Iterator for Lines<'a> { fn size_hint(&self) -> (uint, Option) { self.inner.size_hint() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a> DoubleEndedIterator for Lines<'a> { #[inline] fn next_back(&mut self) -> Option<&'a str> { self.inner.next_back() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a> Iterator for LinesAny<'a> { type Item = &'a str; @@ -1631,7 +1638,7 @@ impl<'a> Iterator for LinesAny<'a> { fn size_hint(&self) -> (uint, Option) { self.inner.size_hint() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a> DoubleEndedIterator for LinesAny<'a> { #[inline] fn next_back(&mut self) -> Option<&'a str> { self.inner.next_back() } diff --git a/src/libcore/tuple.rs b/src/libcore/tuple.rs index 5baeae236b3..82d38f82b16 100644 --- a/src/libcore/tuple.rs +++ b/src/libcore/tuple.rs @@ -33,7 +33,7 @@ //! * `Ord` //! * `Default` -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] use clone::Clone; use cmp::*; @@ -55,14 +55,14 @@ macro_rules! tuple_impls { } )+) => { $( - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl<$($T:Clone),+> Clone for ($($T,)+) { fn clone(&self) -> ($($T,)+) { ($(e!(self.$idx.clone()),)+) } } - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl<$($T:PartialEq),+> PartialEq for ($($T,)+) { #[inline] fn eq(&self, other: &($($T,)+)) -> bool { @@ -74,10 +74,10 @@ macro_rules! tuple_impls { } } - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl<$($T:Eq),+> Eq for ($($T,)+) {} - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl<$($T:PartialOrd + PartialEq),+> PartialOrd for ($($T,)+) { #[inline] fn partial_cmp(&self, other: &($($T,)+)) -> Option { @@ -101,7 +101,7 @@ macro_rules! tuple_impls { } } - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl<$($T:Ord),+> Ord for ($($T,)+) { #[inline] fn cmp(&self, other: &($($T,)+)) -> Ordering { @@ -109,9 +109,9 @@ macro_rules! tuple_impls { } } - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] impl<$($T:Default),+> Default for ($($T,)+) { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] #[inline] fn default() -> ($($T,)+) { ($({ let x: $T = Default::default(); x},)+) diff --git a/src/libflate/lib.rs b/src/libflate/lib.rs index f0a2ab3d1d6..4a23eb65268 100644 --- a/src/libflate/lib.rs +++ b/src/libflate/lib.rs @@ -15,7 +15,7 @@ //! [mz]: https://code.google.com/p/miniz/ #![crate_name = "flate"] -#![unstable] +#![unstable(feature = "unnamed_feature", since = "1.0.0")] #![staged_api] #![allow(unknown_features)] #![feature(int_uint)] #![allow(unstable)] diff --git a/src/libfmt_macros/lib.rs b/src/libfmt_macros/lib.rs index 0ff15327441..3a52ead26b5 100644 --- a/src/libfmt_macros/lib.rs +++ b/src/libfmt_macros/lib.rs @@ -15,7 +15,7 @@ //! generated instead. #![crate_name = "fmt_macros"] -#![unstable] +#![unstable(feature = "unnamed_feature", since = "1.0.0")] #![staged_api] #![crate_type = "rlib"] #![crate_type = "dylib"] diff --git a/src/libgetopts/lib.rs b/src/libgetopts/lib.rs index c2114d4c6df..1f069b5c94c 100644 --- a/src/libgetopts/lib.rs +++ b/src/libgetopts/lib.rs @@ -78,7 +78,8 @@ //! ``` #![crate_name = "getopts"] -#![unstable = "use the crates.io `getopts` library instead"] +#![unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "use the crates.io `getopts` library instead")] #![staged_api] #![crate_type = "rlib"] #![crate_type = "dylib"] @@ -538,7 +539,8 @@ pub fn opt(short_name: &str, impl Fail { /// Convert a `Fail` enum into an error string. - #[deprecated="use `fmt::String` (`{}` format specifier)"] + #[deprecated(feature = "oldstuff", since = "1.0.0", + reason = "use `fmt::String` (`{}` format specifier)")] pub fn to_err_msg(self) -> String { self.to_string() } diff --git a/src/libgraphviz/lib.rs b/src/libgraphviz/lib.rs index 2d7d88f0f35..cff042271b1 100644 --- a/src/libgraphviz/lib.rs +++ b/src/libgraphviz/lib.rs @@ -265,7 +265,7 @@ //! * [DOT language](http://www.graphviz.org/doc/info/lang.html) #![crate_name = "graphviz"] -#![unstable] +#![unstable(feature = "unnamed_feature", since = "1.0.0")] #![staged_api] #![crate_type = "rlib"] #![crate_type = "dylib"] diff --git a/src/libgraphviz/maybe_owned_vec.rs b/src/libgraphviz/maybe_owned_vec.rs index 567fe04c5af..e93159eca21 100644 --- a/src/libgraphviz/maybe_owned_vec.rs +++ b/src/libgraphviz/maybe_owned_vec.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![deprecated = "use std::vec::CowVec"] +#![deprecated(feature = "oldstuff", since = "1.0.0", reason = "use std::vec::CowVec")] pub use self::MaybeOwnedVector::*; diff --git a/src/liblibc/lib.rs b/src/liblibc/lib.rs index fa6468517e6..fc90a1905a8 100644 --- a/src/liblibc/lib.rs +++ b/src/liblibc/lib.rs @@ -10,7 +10,8 @@ #![crate_name = "libc"] #![crate_type = "rlib"] -#![cfg_attr(not(feature = "cargo-build"), unstable)] +#![cfg_attr(not(feature = "cargo-build"), + unstable(feature = "unnamed_feature", since = "1.0.0"))] #![cfg_attr(not(feature = "cargo-build"), staged_api)] #![allow(unknown_features)] #![feature(int_uint)] #![allow(unstable)] diff --git a/src/liblog/lib.rs b/src/liblog/lib.rs index dbd88434127..872d46c4324 100644 --- a/src/liblog/lib.rs +++ b/src/liblog/lib.rs @@ -156,7 +156,8 @@ //! if logging is disabled, none of the components of the log will be executed. #![crate_name = "log"] -#![unstable = "use the crates.io `log` library instead"] +#![unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "use the crates.io `log` library instead")] #![staged_api] #![crate_type = "rlib"] #![crate_type = "dylib"] diff --git a/src/librand/distributions/mod.rs b/src/librand/distributions/mod.rs index e248de10df4..c03dbc280d3 100644 --- a/src/librand/distributions/mod.rs +++ b/src/librand/distributions/mod.rs @@ -17,7 +17,7 @@ //! internally. The `IndependentSample` trait is for generating values //! that do not need to record state. -#![unstable] +#![unstable(feature = "unnamed_feature", since = "1.0.0")] use core::prelude::*; use core::num::{Float, Int}; diff --git a/src/librand/lib.rs b/src/librand/lib.rs index 853eb41d011..e8a1cb2a18d 100644 --- a/src/librand/lib.rs +++ b/src/librand/lib.rs @@ -25,7 +25,7 @@ #![allow(unknown_features)] #![feature(int_uint)] #![allow(unstable)] #![no_std] -#![unstable] +#![unstable(feature = "unnamed_feature", since = "1.0.0")] #![staged_api] #[macro_use] diff --git a/src/librand/reseeding.rs b/src/librand/reseeding.rs index 63de49ac5cd..d248cb888fc 100644 --- a/src/librand/reseeding.rs +++ b/src/librand/reseeding.rs @@ -141,9 +141,9 @@ impl Reseeder for ReseedWithDefault { *rng = Default::default(); } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Default for ReseedWithDefault { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn default() -> ReseedWithDefault { ReseedWithDefault } } diff --git a/src/librbml/lib.rs b/src/librbml/lib.rs index 8fcd753b4a8..2eedc0d8f8f 100644 --- a/src/librbml/lib.rs +++ b/src/librbml/lib.rs @@ -16,7 +16,7 @@ //! http://www.matroska.org/technical/specs/rfc/index.html #![crate_name = "rbml"] -#![unstable] +#![unstable(feature = "unnamed_feature", since = "1.0.0")] #![staged_api] #![crate_type = "rlib"] #![crate_type = "dylib"] diff --git a/src/libregex/lib.rs b/src/libregex/lib.rs index 002b74cf1ef..0b7ebc90bec 100644 --- a/src/libregex/lib.rs +++ b/src/libregex/lib.rs @@ -16,7 +16,8 @@ #![crate_name = "regex"] #![crate_type = "rlib"] #![crate_type = "dylib"] -#![unstable = "use the crates.io `regex` library instead"] +#![unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "use the crates.io `regex` library instead")] #![staged_api] #![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png", html_favicon_url = "http://www.rust-lang.org/favicon.ico", diff --git a/src/libregex/re.rs b/src/libregex/re.rs index abc51d62404..86329e365f5 100644 --- a/src/libregex/re.rs +++ b/src/libregex/re.rs @@ -255,7 +255,7 @@ impl Regex { } #[doc(hidden)] - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn names_iter<'a>(&'a self) -> NamesIter<'a> { match *self { Native(ref n) => NamesIterNative(n.names.iter()), diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs index 62869064551..ffde6495717 100644 --- a/src/librustc/lib.rs +++ b/src/librustc/lib.rs @@ -15,7 +15,7 @@ //! This API is completely unstable and subject to change. #![crate_name = "rustc"] -#![unstable] +#![unstable(feature = "unnamed_feature", since = "1.0.0")] #![staged_api] #![crate_type = "dylib"] #![crate_type = "rlib"] diff --git a/src/librustc/lint/builtin.rs b/src/librustc/lint/builtin.rs index 314cde10014..23eda47303e 100644 --- a/src/librustc/lint/builtin.rs +++ b/src/librustc/lint/builtin.rs @@ -1637,19 +1637,15 @@ declare_lint! { /// Checks for use of items with `#[deprecated]`, `#[unstable]` and /// `#[unstable]` attributes, or no stability attribute. #[derive(Copy)] -pub struct Stability { this_crate_staged: bool } +pub struct Stability; impl Stability { - pub fn new() -> Stability { Stability { this_crate_staged: false } } - fn lint(&self, cx: &Context, id: ast::DefId, span: Span) { + if !stability::is_staged_api(cx.tcx, id) { return } + let ref stability = stability::lookup(cx.tcx, id); let cross_crate = !ast_util::is_local(id); - let staged = (!cross_crate && self.this_crate_staged) - || (cross_crate && stability::is_staged_api(cx.tcx, id)); - - if !staged { return } // stability attributes are promises made across crates; only // check DEPRECATED for crate-local usage. @@ -1668,7 +1664,7 @@ impl Stability { fn output(cx: &Context, span: Span, stability: &Option, lint: &'static Lint, label: &'static str) { let msg = match *stability { - Some(attr::Stability { text: Some(ref s), .. }) => { + Some(attr::Stability { reason: Some(ref s), .. }) => { format!("use of {} item: {}", label, *s) } _ => format!("use of {} item", label) @@ -1690,22 +1686,6 @@ impl LintPass for Stability { lint_array!(DEPRECATED, UNSTABLE) } - fn check_crate(&mut self, _: &Context, c: &ast::Crate) { - // Just mark the #[staged_api] attribute used, though nothing else is done - // with it during this pass over the source. - for attr in c.attrs.iter() { - if attr.name().get() == "staged_api" { - match attr.node.value.node { - ast::MetaWord(_) => { - attr::mark_used(attr); - self.this_crate_staged = true; - } - _ => (/*pass*/) - } - } - } - } - fn check_view_item(&mut self, cx: &Context, item: &ast::ViewItem) { // compiler-generated `extern crate` statements have a dummy span. if item.span == DUMMY_SP { return } diff --git a/src/librustc/lint/context.rs b/src/librustc/lint/context.rs index de4efe09f27..17d4e059509 100644 --- a/src/librustc/lint/context.rs +++ b/src/librustc/lint/context.rs @@ -211,13 +211,13 @@ impl LintStore { UnusedAllocation, MissingCopyImplementations, UnstableFeatures, + Stability, ); add_builtin_with_new!(sess, TypeLimits, RawPointerDerive, MissingDoc, - Stability, ); add_lint_group!(sess, "bad_style", diff --git a/src/librustc/middle/stability.rs b/src/librustc/middle/stability.rs index 1a00e175e0f..9f12d849e74 100644 --- a/src/librustc/middle/stability.rs +++ b/src/librustc/middle/stability.rs @@ -11,6 +11,7 @@ //! A pass that annotates every item and method with its stability level, //! propagating default levels lexically from parent to children ast nodes. +use session::Session; use middle::ty; use metadata::csearch; use syntax::codemap::Span; @@ -20,7 +21,7 @@ use syntax::ast::{Attribute, Block, Crate, DefId, FnDecl, NodeId, Variant}; use syntax::ast::{Item, RequiredMethod, ProvidedMethod, TraitItem}; use syntax::ast::{TypeMethod, Method, Generics, StructField, TypeTraitItem}; use syntax::ast_util::is_local; -use syntax::attr::Stability; +use syntax::attr::{Stability, AttrMetaMethods}; use syntax::visit::{FnKind, FkMethod, Visitor}; use util::nodemap::{NodeMap, DefIdMap}; use util::ppaux::Repr; @@ -29,6 +30,8 @@ use std::mem::replace; /// A stability index, giving the stability level for items and methods. pub struct Index { + // Indicates whether this crate has #![staged_api] + staged_api: bool, // stability for crate-local items; unmarked stability == no entry local: NodeMap, // cache for extern-crate items; unmarked stability == entry with None @@ -36,23 +39,24 @@ pub struct Index { } // A private tree-walker for producing an Index. -struct Annotator { +struct Annotator<'a> { + sess: &'a Session, index: Index, parent: Option } -impl Annotator { +impl<'a> Annotator<'a> { // Determine the stability for a node based on its attributes and inherited // stability. The stability is recorded in the index and used as the parent. fn annotate(&mut self, id: NodeId, use_parent: bool, attrs: &Vec, f: F) where F: FnOnce(&mut Annotator), { - match attr::find_stability(attrs.as_slice()) { + match attr::find_stability(self.sess.diagnostic(), attrs.as_slice()) { Some(stab) => { self.index.local.insert(id, stab.clone()); - // Don't inherit #[stable] + // Don't inherit #[stable(feature = "grandfathered", since = "1.0.0")] if stab.level != attr::Stable { let parent = replace(&mut self.parent, Some(stab)); f(self); @@ -71,7 +75,7 @@ impl Annotator { } } -impl<'v> Visitor<'v> for Annotator { +impl<'a, 'v> Visitor<'v> for Annotator<'a> { fn visit_item(&mut self, i: &Item) { // FIXME (#18969): the following is a hack around the fact // that we cannot currently annotate the stability of @@ -138,12 +142,30 @@ impl<'v> Visitor<'v> for Annotator { impl Index { /// Construct the stability index for a crate being compiled. - pub fn build(krate: &Crate) -> Index { + pub fn build(sess: &Session, krate: &Crate) -> Index { + let mut staged_api = false; + for attr in krate.attrs.iter() { + if attr.name().get() == "staged_api" { + match attr.node.value.node { + ast::MetaWord(_) => { + attr::mark_used(attr); + staged_api = true; + } + _ => (/*pass*/) + } + } + } + let index = Index { + staged_api: staged_api, + local: NodeMap(), + extern_cache: DefIdMap() + }; + if !staged_api { + return index; + } let mut annotator = Annotator { - index: Index { - local: NodeMap(), - extern_cache: DefIdMap() - }, + sess: sess, + index: index, parent: None }; annotator.annotate(ast::CRATE_NODE_ID, true, &krate.attrs, @@ -197,8 +219,7 @@ pub fn is_staged_api(tcx: &ty::ctxt, id: DefId) -> bool { is_staged_api(tcx, trait_method_id) } _ if is_local(id) => { - // Unused case - unreachable!() + tcx.stability.borrow().staged_api } _ => { csearch::is_staged_api(&tcx.sess.cstore, id) diff --git a/src/librustc_back/lib.rs b/src/librustc_back/lib.rs index d778b916b67..3e33dfcef5a 100644 --- a/src/librustc_back/lib.rs +++ b/src/librustc_back/lib.rs @@ -22,7 +22,7 @@ //! build speedups. #![crate_name = "rustc_back"] -#![unstable] +#![unstable(feature = "unnamed_feature", since = "1.0.0")] #![staged_api] #![crate_type = "dylib"] #![crate_type = "rlib"] diff --git a/src/librustc_bitflags/lib.rs b/src/librustc_bitflags/lib.rs index c47a525552d..63d97b1ebe5 100644 --- a/src/librustc_bitflags/lib.rs +++ b/src/librustc_bitflags/lib.rs @@ -9,10 +9,10 @@ // except according to those terms. #![crate_name = "rustc_bitflags"] -#![unstable] #![staged_api] #![crate_type = "rlib"] #![no_std] +#![unstable(feature = "unnamed_feature", since = "1.0.0")] //! A typesafe bitmask flag generator. diff --git a/src/librustc_borrowck/lib.rs b/src/librustc_borrowck/lib.rs index 4dd9b3ad2ef..4c7454bca7b 100644 --- a/src/librustc_borrowck/lib.rs +++ b/src/librustc_borrowck/lib.rs @@ -9,7 +9,7 @@ // except according to those terms. #![crate_name = "rustc_borrowck"] -#![unstable] +#![unstable(feature = "unnamed_feature", since = "1.0.0")] #![staged_api] #![crate_type = "dylib"] #![crate_type = "rlib"] diff --git a/src/librustc_driver/driver.rs b/src/librustc_driver/driver.rs index 3fac5ba9674..9c5756f8095 100644 --- a/src/librustc_driver/driver.rs +++ b/src/librustc_driver/driver.rs @@ -599,7 +599,7 @@ pub fn phase_3_run_analysis_passes<'tcx>(sess: Session, middle::check_loop::check_crate(&sess, krate)); let stability_index = time(time_passes, "stability index", (), |_| - stability::Index::build(krate)); + stability::Index::build(&sess, krate)); time(time_passes, "static item recursion checking", (), |_| middle::check_static_recursion::check_crate(&sess, krate, &def_map, &ast_map)); diff --git a/src/librustc_driver/lib.rs b/src/librustc_driver/lib.rs index 50ff4546c37..e35bc807d28 100644 --- a/src/librustc_driver/lib.rs +++ b/src/librustc_driver/lib.rs @@ -15,7 +15,7 @@ //! This API is completely unstable and subject to change. #![crate_name = "rustc_driver"] -#![unstable] +#![unstable(feature = "unnamed_feature", since = "1.0.0")] #![staged_api] #![crate_type = "dylib"] #![crate_type = "rlib"] diff --git a/src/librustc_driver/test.rs b/src/librustc_driver/test.rs index f68c76f4c44..05ea7094c44 100644 --- a/src/librustc_driver/test.rs +++ b/src/librustc_driver/test.rs @@ -124,7 +124,7 @@ fn test_env(source_string: &str, resolve::resolve_crate(&sess, &ast_map, &lang_items, krate, resolve::MakeGlobMap::No); let named_region_map = resolve_lifetime::krate(&sess, krate, &def_map); let region_map = region::resolve_crate(&sess, krate); - let stability_index = stability::Index::build(krate); + let stability_index = stability::Index::build(&sess, krate); let arenas = ty::CtxtArenas::new(); let tcx = ty::mk_ctxt(sess, &arenas, diff --git a/src/librustc_llvm/lib.rs b/src/librustc_llvm/lib.rs index 4c9a25f42fb..93568f73f9d 100644 --- a/src/librustc_llvm/lib.rs +++ b/src/librustc_llvm/lib.rs @@ -14,7 +14,7 @@ #![allow(dead_code)] #![crate_name = "rustc_llvm"] -#![unstable] +#![unstable(feature = "unnamed_feature", since = "1.0.0")] #![staged_api] #![crate_type = "dylib"] #![crate_type = "rlib"] diff --git a/src/librustc_privacy/lib.rs b/src/librustc_privacy/lib.rs index e12c195a3af..28841fc0076 100644 --- a/src/librustc_privacy/lib.rs +++ b/src/librustc_privacy/lib.rs @@ -9,7 +9,7 @@ // except according to those terms. #![crate_name = "rustc_privacy"] -#![unstable] +#![unstable(feature = "unnamed_feature", since = "1.0.0")] #![staged_api] #![crate_type = "dylib"] #![crate_type = "rlib"] diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs index 31999faa6df..31a4cdfcae8 100644 --- a/src/librustc_resolve/lib.rs +++ b/src/librustc_resolve/lib.rs @@ -9,7 +9,7 @@ // except according to those terms. #![crate_name = "rustc_resolve"] -#![unstable] +#![unstable(feature = "unnamed_feature", since = "1.0.0")] #![staged_api] #![crate_type = "dylib"] #![crate_type = "rlib"] diff --git a/src/librustc_trans/lib.rs b/src/librustc_trans/lib.rs index c3e88e65b2f..4ee2cf92e3d 100644 --- a/src/librustc_trans/lib.rs +++ b/src/librustc_trans/lib.rs @@ -15,7 +15,7 @@ //! This API is completely unstable and subject to change. #![crate_name = "rustc_trans"] -#![unstable] +#![unstable(feature = "unnamed_feature", since = "1.0.0")] #![staged_api] #![crate_type = "dylib"] #![crate_type = "rlib"] diff --git a/src/librustc_typeck/lib.rs b/src/librustc_typeck/lib.rs index 47b5cd4b11e..5022e301c2a 100644 --- a/src/librustc_typeck/lib.rs +++ b/src/librustc_typeck/lib.rs @@ -64,7 +64,7 @@ This API is completely unstable and subject to change. */ #![crate_name = "rustc_typeck"] -#![unstable] +#![unstable(feature = "unnamed_feature", since = "1.0.0")] #![staged_api] #![crate_type = "dylib"] #![crate_type = "rlib"] diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs index 7342c9f3e81..22c8e1f3b32 100644 --- a/src/librustdoc/clean/mod.rs +++ b/src/librustdoc/clean/mod.rs @@ -33,6 +33,7 @@ use syntax::ast_util; use syntax::ast_util::PostExpansionMethod; use syntax::attr; use syntax::attr::{AttributeMethods, AttrMetaMethods}; +use syntax::codemap; use syntax::codemap::{DUMMY_SP, Pos, Spanned}; use syntax::parse::token::{self, InternedString, special_idents}; use syntax::ptr::P; @@ -449,11 +450,13 @@ impl attr::AttrMetaMethods for Attribute { } } fn meta_item_list<'a>(&'a self) -> Option<&'a [P]> { None } + fn span(&self) -> codemap::Span { unimplemented!() } } impl<'a> attr::AttrMetaMethods for &'a Attribute { fn name(&self) -> InternedString { (**self).name() } fn value_str(&self) -> Option { (**self).value_str() } fn meta_item_list(&self) -> Option<&[P]> { None } + fn span(&self) -> codemap::Span { unimplemented!() } } #[derive(Clone, RustcEncodable, RustcDecodable, PartialEq, Show)] @@ -2483,15 +2486,19 @@ impl Clean for doctree::Macro { #[derive(Clone, RustcEncodable, RustcDecodable)] pub struct Stability { pub level: attr::StabilityLevel, - pub text: String + pub feature: String, + pub since: String, + pub reason: String } impl Clean for attr::Stability { fn clean(&self, _: &DocContext) -> Stability { Stability { level: self.level, - text: self.text.as_ref().map_or("".to_string(), - |interned| interned.get().to_string()), + feature: self.feature.get().to_string(), + since: self.since.get().to_string(), + reason: self.reason.as_ref().map_or("".to_string(), + |interned| interned.get().to_string()), } } } diff --git a/src/librustdoc/html/format.rs b/src/librustdoc/html/format.rs index ad13ab59c03..012b417a552 100644 --- a/src/librustdoc/html/format.rs +++ b/src/librustdoc/html/format.rs @@ -714,7 +714,7 @@ impl<'a> fmt::String for Stability<'a> { Some(ref stability) => { write!(f, "{lvl}", lvl = stability.level, - reason = stability.text) + reason = stability.reason) } None => Ok(()) } @@ -728,8 +728,8 @@ impl<'a> fmt::String for ConciseStability<'a> { Some(ref stability) => { write!(f, "", lvl = stability.level, - colon = if stability.text.len() > 0 { ": " } else { "" }, - reason = stability.text) + colon = if stability.reason.len() > 0 { ": " } else { "" }, + reason = stability.reason) } None => { write!(f, "") diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs index 71bd53009af..c362376620a 100644 --- a/src/librustdoc/lib.rs +++ b/src/librustdoc/lib.rs @@ -9,7 +9,7 @@ // except according to those terms. #![crate_name = "rustdoc"] -#![unstable] +#![unstable(feature = "unnamed_feature", since = "1.0.0")] #![staged_api] #![crate_type = "dylib"] #![crate_type = "rlib"] diff --git a/src/libserialize/lib.rs b/src/libserialize/lib.rs index b24e1bd685f..1fd2b6b5d9a 100644 --- a/src/libserialize/lib.rs +++ b/src/libserialize/lib.rs @@ -15,7 +15,8 @@ Core encoding and decoding interfaces. */ #![crate_name = "serialize"] -#![unstable = "deprecated in favor of rustc-serialize on crates.io"] +#![unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "deprecated in favor of rustc-serialize on crates.io")] #![staged_api] #![crate_type = "rlib"] #![crate_type = "dylib"] diff --git a/src/libstd/ascii.rs b/src/libstd/ascii.rs index 77c2315194b..9e301bf9c04 100644 --- a/src/libstd/ascii.rs +++ b/src/libstd/ascii.rs @@ -12,7 +12,8 @@ //! Operations on ASCII strings and characters -#![unstable = "unsure about placement and naming"] +#![unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "unsure about placement and naming")] use iter::IteratorExt; use ops::FnMut; @@ -22,7 +23,8 @@ use string::String; use vec::Vec; /// Extension methods for ASCII-subset only operations on owned strings -#[unstable = "would prefer to do this in a more general way"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "would prefer to do this in a more general way")] pub trait OwnedAsciiExt { /// Convert the string to ASCII upper case: /// ASCII letters 'a' to 'z' are mapped to 'A' to 'Z', @@ -36,7 +38,8 @@ pub trait OwnedAsciiExt { } /// Extension methods for ASCII-subset only operations on string slices -#[unstable = "would prefer to do this in a more general way"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "would prefer to do this in a more general way")] pub trait AsciiExt { /// Check if within the ASCII range. fn is_ascii(&self) -> bool; @@ -57,7 +60,8 @@ pub trait AsciiExt { fn eq_ignore_ascii_case(&self, other: &Self) -> bool; } -#[unstable = "would prefer to do this in a more general way"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "would prefer to do this in a more general way")] impl AsciiExt for str { #[inline] fn is_ascii(&self) -> bool { @@ -82,7 +86,8 @@ impl AsciiExt for str { } } -#[unstable = "would prefer to do this in a more general way"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "would prefer to do this in a more general way")] impl OwnedAsciiExt for String { #[inline] fn into_ascii_uppercase(self) -> String { @@ -97,7 +102,8 @@ impl OwnedAsciiExt for String { } } -#[unstable = "would prefer to do this in a more general way"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "would prefer to do this in a more general way")] impl AsciiExt> for [u8] { #[inline] fn is_ascii(&self) -> bool { @@ -123,7 +129,8 @@ impl AsciiExt> for [u8] { } } -#[unstable = "would prefer to do this in a more general way"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "would prefer to do this in a more general way")] impl OwnedAsciiExt for Vec { #[inline] fn into_ascii_uppercase(mut self) -> Vec { @@ -142,7 +149,8 @@ impl OwnedAsciiExt for Vec { } } -#[unstable = "would prefer to do this in a more general way"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "would prefer to do this in a more general way")] impl AsciiExt for u8 { #[inline] fn is_ascii(&self) -> bool { @@ -165,7 +173,8 @@ impl AsciiExt for u8 { } } -#[unstable = "would prefer to do this in a more general way"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "would prefer to do this in a more general way")] impl AsciiExt for char { #[inline] fn is_ascii(&self) -> bool { @@ -207,7 +216,8 @@ impl AsciiExt for char { /// - Any other chars in the range [0x20,0x7e] are not escaped. /// - Any other chars are given hex escapes. /// - Unicode escapes are never generated by this function. -#[unstable = "needs to be updated to use an iterator"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "needs to be updated to use an iterator")] pub fn escape_default(c: u8, mut f: F) where F: FnMut(u8), { diff --git a/src/libstd/bool.rs b/src/libstd/bool.rs index bbaab5ee3db..6ec1299aac5 100644 --- a/src/libstd/bool.rs +++ b/src/libstd/bool.rs @@ -11,5 +11,5 @@ //! The boolean type #![doc(primitive = "bool")] -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] diff --git a/src/libstd/collections/hash/map.rs b/src/libstd/collections/hash/map.rs index d3ac632617d..6690d3bd374 100644 --- a/src/libstd/collections/hash/map.rs +++ b/src/libstd/collections/hash/map.rs @@ -296,7 +296,7 @@ fn test_resize_policy() { /// } /// ``` #[derive(Clone)] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct HashMap { // All hashes are keyed on these values, to prevent hash collision attacks. hash_state: S, @@ -499,7 +499,7 @@ impl + Eq, V> HashMap { /// let mut map: HashMap<&str, int> = HashMap::new(); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn new() -> HashMap { Default::default() } @@ -513,7 +513,7 @@ impl + Eq, V> HashMap { /// let mut map: HashMap<&str, int> = HashMap::with_capacity(10); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn with_capacity(capacity: uint) -> HashMap { HashMap::with_capacity_and_hash_state(capacity, Default::default()) } @@ -539,7 +539,7 @@ impl HashMap /// map.insert(1i, 2u); /// ``` #[inline] - #[unstable = "hasher stuff is unclear"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "hasher stuff is unclear")] pub fn with_hash_state(hash_state: S) -> HashMap { HashMap { hash_state: hash_state, @@ -567,7 +567,7 @@ impl HashMap /// map.insert(1i, 2u); /// ``` #[inline] - #[unstable = "hasher stuff is unclear"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "hasher stuff is unclear")] pub fn with_capacity_and_hash_state(capacity: uint, hash_state: S) -> HashMap { let resize_policy = DefaultResizePolicy::new(); @@ -591,7 +591,7 @@ impl HashMap /// assert!(map.capacity() >= 100); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn capacity(&self) -> uint { self.resize_policy.usable_capacity(self.table.capacity()) } @@ -611,7 +611,7 @@ impl HashMap /// let mut map: HashMap<&str, int> = HashMap::new(); /// map.reserve(10); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn reserve(&mut self, additional: uint) { let new_size = self.len().checked_add(additional).expect("capacity overflow"); let min_cap = self.resize_policy.min_capacity(new_size); @@ -723,7 +723,7 @@ impl HashMap /// map.shrink_to_fit(); /// assert!(map.capacity() >= 2); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn shrink_to_fit(&mut self) { let min_capacity = self.resize_policy.min_capacity(self.len()); let min_capacity = max(min_capacity.next_power_of_two(), INITIAL_CAPACITY); @@ -817,7 +817,7 @@ impl HashMap /// println!("{}", key); /// } /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn keys<'a>(&'a self) -> Keys<'a, K, V> { fn first((a, _): (A, B)) -> A { a } let first: fn((&'a K,&'a V)) -> &'a K = first; // coerce to fn ptr @@ -842,7 +842,7 @@ impl HashMap /// println!("{}", key); /// } /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn values<'a>(&'a self) -> Values<'a, K, V> { fn second((_, b): (A, B)) -> B { b } let second: fn((&'a K,&'a V)) -> &'a V = second; // coerce to fn ptr @@ -867,7 +867,7 @@ impl HashMap /// println!("key: {} val: {}", key, val); /// } /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn iter(&self) -> Iter { Iter { inner: self.table.iter() } } @@ -895,7 +895,7 @@ impl HashMap /// println!("key: {} val: {}", key, val); /// } /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn iter_mut(&mut self) -> IterMut { IterMut { inner: self.table.iter_mut() } } @@ -917,7 +917,7 @@ impl HashMap /// // Not possible with .iter() /// let vec: Vec<(&str, int)> = map.into_iter().collect(); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn into_iter(self) -> IntoIter { fn last_two((_, b, c): (A, B, C)) -> (B, C) { (b, c) } let last_two: fn((SafeHash, K, V)) -> (K, V) = last_two; @@ -928,7 +928,8 @@ impl HashMap } /// Gets the given key's corresponding entry in the map for in-place manipulation. - #[unstable = "precise API still being fleshed out"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "precise API still being fleshed out")] pub fn entry<'a>(&'a mut self, key: K) -> Entry<'a, K, V> { // Gotta resize now. @@ -950,7 +951,7 @@ impl HashMap /// a.insert(1u, "a"); /// assert_eq!(a.len(), 1); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn len(&self) -> uint { self.table.size() } /// Return true if the map contains no elements. @@ -966,7 +967,7 @@ impl HashMap /// assert!(!a.is_empty()); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn is_empty(&self) -> bool { self.len() == 0 } /// Clears the map, returning all key-value pairs as an iterator. Keeps the @@ -989,7 +990,8 @@ impl HashMap /// assert!(a.is_empty()); /// ``` #[inline] - #[unstable = "matches collection reform specification, waiting for dust to settle"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "matches collection reform specification, waiting for dust to settle")] pub fn drain(&mut self) -> Drain { fn last_two((_, b, c): (A, B, C)) -> (B, C) { (b, c) } let last_two: fn((SafeHash, K, V)) -> (K, V) = last_two; // coerce to fn pointer @@ -1012,7 +1014,7 @@ impl HashMap /// a.clear(); /// assert!(a.is_empty()); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] #[inline] pub fn clear(&mut self) { self.drain(); @@ -1034,7 +1036,7 @@ impl HashMap /// assert_eq!(map.get(&1), Some(&"a")); /// assert_eq!(map.get(&2), None); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn get(&self, k: &Q) -> Option<&V> where Q: Hash + Eq + BorrowFrom { @@ -1057,7 +1059,7 @@ impl HashMap /// assert_eq!(map.contains_key(&1), true); /// assert_eq!(map.contains_key(&2), false); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn contains_key(&self, k: &Q) -> bool where Q: Hash + Eq + BorrowFrom { @@ -1083,7 +1085,7 @@ impl HashMap /// } /// assert_eq!(map[1], "b"); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn get_mut(&mut self, k: &Q) -> Option<&mut V> where Q: Hash + Eq + BorrowFrom { @@ -1106,7 +1108,7 @@ impl HashMap /// assert_eq!(map.insert(37, "c"), Some("b")); /// assert_eq!(map[37], "c"); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn insert(&mut self, k: K, v: V) -> Option { let hash = self.make_hash(&k); self.reserve(1); @@ -1135,7 +1137,7 @@ impl HashMap /// assert_eq!(map.remove(&1), Some("a")); /// assert_eq!(map.remove(&1), None); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn remove(&mut self, k: &Q) -> Option where Q: Hash + Eq + BorrowFrom { @@ -1208,14 +1210,14 @@ impl PartialEq for HashMap } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Eq for HashMap where K: Eq + Hash, V: Eq, S: HashState, H: hash::Hasher {} -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Show for HashMap where K: Eq + Hash + Show, V: Show, S: HashState, @@ -1233,7 +1235,7 @@ impl Show for HashMap } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Default for HashMap where K: Eq + Hash, S: HashState + Default, @@ -1244,7 +1246,7 @@ impl Default for HashMap } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Index for HashMap where K: Eq + Hash, Q: Eq + Hash + BorrowFrom, @@ -1259,7 +1261,7 @@ impl Index for HashMap } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl IndexMut for HashMap where K: Eq + Hash, Q: Eq + Hash + BorrowFrom, @@ -1275,7 +1277,7 @@ impl IndexMut for HashMap } /// HashMap iterator -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Iter<'a, K: 'a, V: 'a> { inner: table::Iter<'a, K, V> } @@ -1290,13 +1292,13 @@ impl<'a, K, V> Clone for Iter<'a, K, V> { } /// HashMap mutable values iterator -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct IterMut<'a, K: 'a, V: 'a> { inner: table::IterMut<'a, K, V> } /// HashMap move iterator -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct IntoIter { inner: iter::Map< (SafeHash, K, V), @@ -1307,7 +1309,7 @@ pub struct IntoIter { } /// HashMap keys iterator -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Keys<'a, K: 'a, V: 'a> { inner: Map<(&'a K, &'a V), &'a K, Iter<'a, K, V>, fn((&'a K, &'a V)) -> &'a K> } @@ -1322,7 +1324,7 @@ impl<'a, K, V> Clone for Keys<'a, K, V> { } /// HashMap values iterator -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Values<'a, K: 'a, V: 'a> { inner: Map<(&'a K, &'a V), &'a V, Iter<'a, K, V>, fn((&'a K, &'a V)) -> &'a V> } @@ -1337,7 +1339,8 @@ impl<'a, K, V> Clone for Values<'a, K, V> { } /// HashMap drain iterator -#[unstable = "matches collection reform specification, waiting for dust to settle"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "matches collection reform specification, waiting for dust to settle")] pub struct Drain<'a, K: 'a, V: 'a> { inner: iter::Map< (SafeHash, K, V), @@ -1348,13 +1351,15 @@ pub struct Drain<'a, K: 'a, V: 'a> { } /// A view into a single occupied location in a HashMap -#[unstable = "precise API still being fleshed out"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "precise API still being fleshed out")] pub struct OccupiedEntry<'a, K: 'a, V: 'a> { elem: FullBucket>, } /// A view into a single empty location in a HashMap -#[unstable = "precise API still being fleshed out"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "precise API still being fleshed out")] pub struct VacantEntry<'a, K: 'a, V: 'a> { hash: SafeHash, key: K, @@ -1362,7 +1367,8 @@ pub struct VacantEntry<'a, K: 'a, V: 'a> { } /// A view into a single location in a map, which may be vacant or occupied -#[unstable = "precise API still being fleshed out"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "precise API still being fleshed out")] pub enum Entry<'a, K: 'a, V: 'a> { /// An occupied Entry Occupied(OccupiedEntry<'a, K, V>), @@ -1379,79 +1385,80 @@ enum VacantEntryState { NoElem(EmptyBucket), } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, K, V> Iterator for Iter<'a, K, V> { type Item = (&'a K, &'a V); #[inline] fn next(&mut self) -> Option<(&'a K, &'a V)> { self.inner.next() } #[inline] fn size_hint(&self) -> (usize, Option) { self.inner.size_hint() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, K, V> ExactSizeIterator for Iter<'a, K, V> { #[inline] fn len(&self) -> usize { self.inner.len() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, K, V> Iterator for IterMut<'a, K, V> { type Item = (&'a K, &'a mut V); #[inline] fn next(&mut self) -> Option<(&'a K, &'a mut V)> { self.inner.next() } #[inline] fn size_hint(&self) -> (usize, Option) { self.inner.size_hint() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, K, V> ExactSizeIterator for IterMut<'a, K, V> { #[inline] fn len(&self) -> usize { self.inner.len() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Iterator for IntoIter { type Item = (K, V); #[inline] fn next(&mut self) -> Option<(K, V)> { self.inner.next() } #[inline] fn size_hint(&self) -> (usize, Option) { self.inner.size_hint() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl ExactSizeIterator for IntoIter { #[inline] fn len(&self) -> usize { self.inner.len() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, K, V> Iterator for Keys<'a, K, V> { type Item = &'a K; #[inline] fn next(&mut self) -> Option<(&'a K)> { self.inner.next() } #[inline] fn size_hint(&self) -> (usize, Option) { self.inner.size_hint() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, K, V> ExactSizeIterator for Keys<'a, K, V> { #[inline] fn len(&self) -> usize { self.inner.len() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, K, V> Iterator for Values<'a, K, V> { type Item = &'a V; #[inline] fn next(&mut self) -> Option<(&'a V)> { self.inner.next() } #[inline] fn size_hint(&self) -> (usize, Option) { self.inner.size_hint() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, K, V> ExactSizeIterator for Values<'a, K, V> { #[inline] fn len(&self) -> usize { self.inner.len() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, K, V> Iterator for Drain<'a, K, V> { type Item = (K, V); #[inline] fn next(&mut self) -> Option<(K, V)> { self.inner.next() } #[inline] fn size_hint(&self) -> (usize, Option) { self.inner.size_hint() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, K, V> ExactSizeIterator for Drain<'a, K, V> { #[inline] fn len(&self) -> usize { self.inner.len() } } -#[unstable = "matches collection reform v2 specification, waiting for dust to settle"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "matches collection reform v2 specification, waiting for dust to settle")] impl<'a, K, V> Entry<'a, K, V> { /// Returns a mutable reference to the entry if occupied, or the VacantEntry if vacant pub fn get(self) -> Result<&'a mut V, VacantEntry<'a, K, V>> { @@ -1462,7 +1469,8 @@ impl<'a, K, V> Entry<'a, K, V> { } } -#[unstable = "matches collection reform v2 specification, waiting for dust to settle"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "matches collection reform v2 specification, waiting for dust to settle")] impl<'a, K, V> OccupiedEntry<'a, K, V> { /// Gets a reference to the value in the entry pub fn get(&self) -> &V { @@ -1493,7 +1501,8 @@ impl<'a, K, V> OccupiedEntry<'a, K, V> { } } -#[unstable = "matches collection reform v2 specification, waiting for dust to settle"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "matches collection reform v2 specification, waiting for dust to settle")] impl<'a, K: 'a, V: 'a> VacantEntry<'a, K, V> { /// Sets the value of the entry with the VacantEntry's key, /// and returns a mutable reference to it @@ -1509,7 +1518,7 @@ impl<'a, K: 'a, V: 'a> VacantEntry<'a, K, V> { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl FromIterator<(K, V)> for HashMap where K: Eq + Hash, S: HashState + Default, @@ -1524,7 +1533,7 @@ impl FromIterator<(K, V)> for HashMap } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Extend<(K, V)> for HashMap where K: Eq + Hash, S: HashState, @@ -1545,13 +1554,15 @@ impl Extend<(K, V)> for HashMap /// instances are unlikely to produce the same result for the same values. #[derive(Clone)] #[allow(missing_copy_implementations)] -#[unstable = "hashing an hash maps may be altered"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "hashing an hash maps may be altered")] pub struct RandomState { k0: u64, k1: u64, } -#[unstable = "hashing an hash maps may be altered"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "hashing an hash maps may be altered")] impl RandomState { /// Construct a new `RandomState` that is initialized with random keys. #[inline] @@ -1561,7 +1572,8 @@ impl RandomState { } } -#[unstable = "hashing an hash maps may be altered"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "hashing an hash maps may be altered")] impl HashState for RandomState { type Hasher = Hasher; fn hasher(&self) -> Hasher { @@ -1569,7 +1581,8 @@ impl HashState for RandomState { } } -#[unstable = "hashing an hash maps may be altered"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "hashing an hash maps may be altered")] impl Default for RandomState { #[inline] fn default() -> RandomState { diff --git a/src/libstd/collections/hash/set.rs b/src/libstd/collections/hash/set.rs index 1293f45161d..c4fecc00bbd 100644 --- a/src/libstd/collections/hash/set.rs +++ b/src/libstd/collections/hash/set.rs @@ -90,7 +90,7 @@ use super::state::HashState; /// } /// ``` #[derive(Clone)] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct HashSet { map: HashMap } @@ -105,7 +105,7 @@ impl + Eq> HashSet { /// let mut set: HashSet = HashSet::new(); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn new() -> HashSet { HashSet::with_capacity(INITIAL_CAPACITY) } @@ -120,7 +120,7 @@ impl + Eq> HashSet { /// let mut set: HashSet = HashSet::with_capacity(10); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn with_capacity(capacity: uint) -> HashSet { HashSet { map: HashMap::with_capacity(capacity) } } @@ -147,7 +147,7 @@ impl HashSet /// set.insert(2u); /// ``` #[inline] - #[unstable = "hasher stuff is unclear"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "hasher stuff is unclear")] pub fn with_hash_state(hash_state: S) -> HashSet { HashSet::with_capacity_and_hash_state(INITIAL_CAPACITY, hash_state) } @@ -171,7 +171,7 @@ impl HashSet /// set.insert(1i); /// ``` #[inline] - #[unstable = "hasher stuff is unclear"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "hasher stuff is unclear")] pub fn with_capacity_and_hash_state(capacity: uint, hash_state: S) -> HashSet { HashSet { @@ -189,7 +189,7 @@ impl HashSet /// assert!(set.capacity() >= 100); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn capacity(&self) -> uint { self.map.capacity() } @@ -209,7 +209,7 @@ impl HashSet /// let mut set: HashSet = HashSet::new(); /// set.reserve(10); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn reserve(&mut self, additional: uint) { self.map.reserve(additional) } @@ -230,7 +230,7 @@ impl HashSet /// set.shrink_to_fit(); /// assert!(set.capacity() >= 2); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn shrink_to_fit(&mut self) { self.map.shrink_to_fit() } @@ -251,7 +251,7 @@ impl HashSet /// println!("{}", x); /// } /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn iter(&self) -> Iter { Iter { iter: self.map.keys() } } @@ -276,7 +276,7 @@ impl HashSet /// println!("{}", x); /// } /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn into_iter(self) -> IntoIter { fn first((a, _): (A, B)) -> A { a } let first: fn((T, ())) -> T = first; @@ -306,7 +306,7 @@ impl HashSet /// let diff: HashSet = b.difference(&a).map(|&x| x).collect(); /// assert_eq!(diff, [4i].iter().map(|&x| x).collect()); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn difference<'a>(&'a self, other: &'a HashSet) -> Difference<'a, T, S> { Difference { iter: self.iter(), @@ -334,7 +334,7 @@ impl HashSet /// assert_eq!(diff1, diff2); /// assert_eq!(diff1, [1i, 4].iter().map(|&x| x).collect()); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn symmetric_difference<'a>(&'a self, other: &'a HashSet) -> SymmetricDifference<'a, T, S> { SymmetricDifference { iter: self.difference(other).chain(other.difference(self)) } @@ -357,7 +357,7 @@ impl HashSet /// let diff: HashSet = a.intersection(&b).map(|&x| x).collect(); /// assert_eq!(diff, [2i, 3].iter().map(|&x| x).collect()); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn intersection<'a>(&'a self, other: &'a HashSet) -> Intersection<'a, T, S> { Intersection { iter: self.iter(), @@ -382,7 +382,7 @@ impl HashSet /// let diff: HashSet = a.union(&b).map(|&x| x).collect(); /// assert_eq!(diff, [1i, 2, 3, 4].iter().map(|&x| x).collect()); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn union<'a>(&'a self, other: &'a HashSet) -> Union<'a, T, S> { Union { iter: self.iter().chain(other.difference(self)) } } @@ -399,7 +399,7 @@ impl HashSet /// v.insert(1u); /// assert_eq!(v.len(), 1); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn len(&self) -> uint { self.map.len() } /// Returns true if the set contains no elements @@ -414,12 +414,13 @@ impl HashSet /// v.insert(1u); /// assert!(!v.is_empty()); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn is_empty(&self) -> bool { self.map.len() == 0 } /// Clears the set, returning all elements in an iterator. #[inline] - #[unstable = "matches collection reform specification, waiting for dust to settle"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "matches collection reform specification, waiting for dust to settle")] pub fn drain(&mut self) -> Drain { fn first((a, _): (A, B)) -> A { a } let first: fn((T, ())) -> T = first; // coerce to fn pointer @@ -439,7 +440,7 @@ impl HashSet /// v.clear(); /// assert!(v.is_empty()); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn clear(&mut self) { self.map.clear() } /// Returns `true` if the set contains a value. @@ -457,7 +458,7 @@ impl HashSet /// assert_eq!(set.contains(&1), true); /// assert_eq!(set.contains(&4), false); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn contains(&self, value: &Q) -> bool where Q: BorrowFrom + Hash + Eq { @@ -481,7 +482,7 @@ impl HashSet /// b.insert(1); /// assert_eq!(a.is_disjoint(&b), false); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn is_disjoint(&self, other: &HashSet) -> bool { self.iter().all(|v| !other.contains(v)) } @@ -502,7 +503,7 @@ impl HashSet /// set.insert(4); /// assert_eq!(set.is_subset(&sup), false); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn is_subset(&self, other: &HashSet) -> bool { self.iter().all(|v| other.contains(v)) } @@ -527,7 +528,7 @@ impl HashSet /// assert_eq!(set.is_superset(&sub), true); /// ``` #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn is_superset(&self, other: &HashSet) -> bool { other.is_subset(self) } @@ -546,7 +547,7 @@ impl HashSet /// assert_eq!(set.insert(2), false); /// assert_eq!(set.len(), 1); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn insert(&mut self, value: T) -> bool { self.map.insert(value, ()).is_none() } /// Removes a value from the set. Returns `true` if the value was @@ -567,7 +568,7 @@ impl HashSet /// assert_eq!(set.remove(&2), true); /// assert_eq!(set.remove(&2), false); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn remove(&mut self, value: &Q) -> bool where Q: BorrowFrom + Hash + Eq { @@ -575,7 +576,7 @@ impl HashSet } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl PartialEq for HashSet where T: Eq + Hash, S: HashState, @@ -588,14 +589,14 @@ impl PartialEq for HashSet } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Eq for HashSet where T: Eq + Hash, S: HashState, H: hash::Hasher {} -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl fmt::Show for HashSet where T: Eq + Hash + fmt::Show, S: HashState, @@ -613,7 +614,7 @@ impl fmt::Show for HashSet } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl FromIterator for HashSet where T: Eq + Hash, S: HashState + Default, @@ -627,7 +628,7 @@ impl FromIterator for HashSet } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Extend for HashSet where T: Eq + Hash, S: HashState, @@ -640,19 +641,19 @@ impl Extend for HashSet } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Default for HashSet where T: Eq + Hash, S: HashState + Default, H: hash::Hasher { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn default() -> HashSet { HashSet::with_hash_state(Default::default()) } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, 'b, T, S, H> BitOr<&'b HashSet> for &'a HashSet where T: Eq + Hash + Clone, S: HashState + Default, @@ -685,7 +686,7 @@ impl<'a, 'b, T, S, H> BitOr<&'b HashSet> for &'a HashSet } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, 'b, T, S, H> BitAnd<&'b HashSet> for &'a HashSet where T: Eq + Hash + Clone, S: HashState + Default, @@ -718,7 +719,7 @@ impl<'a, 'b, T, S, H> BitAnd<&'b HashSet> for &'a HashSet } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, 'b, T, S, H> BitXor<&'b HashSet> for &'a HashSet where T: Eq + Hash + Clone, S: HashState + Default, @@ -751,7 +752,7 @@ impl<'a, 'b, T, S, H> BitXor<&'b HashSet> for &'a HashSet } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, 'b, T, S, H> Sub<&'b HashSet> for &'a HashSet where T: Eq + Hash + Clone, S: HashState + Default, @@ -785,25 +786,25 @@ impl<'a, 'b, T, S, H> Sub<&'b HashSet> for &'a HashSet } /// HashSet iterator -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Iter<'a, K: 'a> { iter: Keys<'a, K, ()> } /// HashSet move iterator -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct IntoIter { iter: Map<(K, ()), K, map::IntoIter, fn((K, ())) -> K> } /// HashSet drain iterator -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Drain<'a, K: 'a> { iter: Map<(K, ()), K, map::Drain<'a, K, ()>, fn((K, ())) -> K>, } /// Intersection iterator -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Intersection<'a, T: 'a, S: 'a> { // iterator of the first set iter: Iter<'a, T>, @@ -812,7 +813,7 @@ pub struct Intersection<'a, T: 'a, S: 'a> { } /// Difference iterator -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Difference<'a, T: 'a, S: 'a> { // iterator of the first set iter: Iter<'a, T>, @@ -821,54 +822,54 @@ pub struct Difference<'a, T: 'a, S: 'a> { } /// Symmetric difference iterator. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct SymmetricDifference<'a, T: 'a, S: 'a> { iter: Chain, Difference<'a, T, S>> } /// Set union iterator. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Union<'a, T: 'a, S: 'a> { iter: Chain, Difference<'a, T, S>> } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, K> Iterator for Iter<'a, K> { type Item = &'a K; fn next(&mut self) -> Option<&'a K> { self.iter.next() } fn size_hint(&self) -> (usize, Option) { self.iter.size_hint() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, K> ExactSizeIterator for Iter<'a, K> { fn len(&self) -> usize { self.iter.len() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Iterator for IntoIter { type Item = K; fn next(&mut self) -> Option { self.iter.next() } fn size_hint(&self) -> (usize, Option) { self.iter.size_hint() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl ExactSizeIterator for IntoIter { fn len(&self) -> usize { self.iter.len() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, K> Iterator for Drain<'a, K> { type Item = K; fn next(&mut self) -> Option { self.iter.next() } fn size_hint(&self) -> (usize, Option) { self.iter.size_hint() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, K> ExactSizeIterator for Drain<'a, K> { fn len(&self) -> usize { self.iter.len() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T, S, H> Iterator for Intersection<'a, T, S> where T: Eq + Hash, S: HashState, @@ -893,7 +894,7 @@ impl<'a, T, S, H> Iterator for Intersection<'a, T, S> } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T, S, H> Iterator for Difference<'a, T, S> where T: Eq + Hash, S: HashState, @@ -918,7 +919,7 @@ impl<'a, T, S, H> Iterator for Difference<'a, T, S> } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T, S, H> Iterator for SymmetricDifference<'a, T, S> where T: Eq + Hash, S: HashState, @@ -930,7 +931,7 @@ impl<'a, T, S, H> Iterator for SymmetricDifference<'a, T, S> fn size_hint(&self) -> (usize, Option) { self.iter.size_hint() } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T, S, H> Iterator for Union<'a, T, S> where T: Eq + Hash, S: HashState, diff --git a/src/libstd/collections/mod.rs b/src/libstd/collections/mod.rs index f085fd259de..2e2d70546ae 100644 --- a/src/libstd/collections/mod.rs +++ b/src/libstd/collections/mod.rs @@ -309,7 +309,7 @@ //! } //! ``` -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] pub use core_collections::Bound; pub use core_collections::{BinaryHeap, Bitv, BitvSet, BTreeMap, BTreeSet}; @@ -323,13 +323,13 @@ pub use self::hash_set::HashSet; mod hash; -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub mod hash_map { //! A hashmap pub use super::hash::map::*; } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub mod hash_set { //! A hashset pub use super::hash::set::*; @@ -337,7 +337,7 @@ pub mod hash_set { /// Experimental support for providing custom hash algorithms to a HashMap and /// HashSet. -#[unstable = "module was recently added"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "module was recently added")] pub mod hash_state { pub use super::hash::state::*; } diff --git a/src/libstd/dynamic_lib.rs b/src/libstd/dynamic_lib.rs index db1239ae5b5..493f5ad2dc6 100644 --- a/src/libstd/dynamic_lib.rs +++ b/src/libstd/dynamic_lib.rs @@ -12,7 +12,7 @@ //! //! A simple wrapper over the platform's dynamic library facilities -#![unstable] +#![unstable(feature = "unnamed_feature", since = "1.0.0")] #![allow(missing_docs)] use prelude::v1::*; diff --git a/src/libstd/error.rs b/src/libstd/error.rs index ff128461978..91603fb7119 100644 --- a/src/libstd/error.rs +++ b/src/libstd/error.rs @@ -78,7 +78,7 @@ //! } //! ``` -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] use prelude::v1::*; @@ -86,7 +86,8 @@ use str::Utf8Error; use string::{FromUtf8Error, FromUtf16Error}; /// Base functionality for all errors in Rust. -#[unstable = "the exact API of this trait may change"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "the exact API of this trait may change")] pub trait Error { /// A short description of the error; usually a static string. fn description(&self) -> &str; @@ -99,21 +100,21 @@ pub trait Error { } /// A trait for types that can be converted from a given error type `E`. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub trait FromError { /// Perform the conversion. fn from_error(err: E) -> Self; } // Any type is convertable from itself -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl FromError for E { fn from_error(err: E) -> E { err } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Error for Utf8Error { fn description(&self) -> &str { match *self { @@ -125,13 +126,13 @@ impl Error for Utf8Error { fn detail(&self) -> Option { Some(self.to_string()) } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Error for FromUtf8Error { fn description(&self) -> &str { "invalid utf-8" } fn detail(&self) -> Option { Some(self.to_string()) } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Error for FromUtf16Error { fn description(&self) -> &str { "invalid utf-16" } } diff --git a/src/libstd/failure.rs b/src/libstd/failure.rs index 54191cf2404..e6b3348e690 100644 --- a/src/libstd/failure.rs +++ b/src/libstd/failure.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![unstable] +#![unstable(feature = "unnamed_feature", since = "1.0.0")] use prelude::v1::*; diff --git a/src/libstd/ffi/mod.rs b/src/libstd/ffi/mod.rs index cc86f804e3e..6017a62e3be 100644 --- a/src/libstd/ffi/mod.rs +++ b/src/libstd/ffi/mod.rs @@ -10,8 +10,9 @@ //! Utilities related to FFI bindings. -#![unstable = "module just underwent fairly large reorganization and the dust \ - still needs to settle"] +#![unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "module just underwent fairly large reorganization and the dust \ + still needs to settle")] pub use self::c_str::CString; pub use self::c_str::c_str_to_bytes; diff --git a/src/libstd/fmt.rs b/src/libstd/fmt.rs index 88fb983361a..d28e84f3cdd 100644 --- a/src/libstd/fmt.rs +++ b/src/libstd/fmt.rs @@ -403,7 +403,7 @@ //! them with the same character. For example, the `{` character is escaped with //! `{{` and the `}` character is escaped with `}}`. -#![unstable] +#![unstable(feature = "unnamed_feature", since = "1.0.0")] use string; @@ -432,8 +432,9 @@ pub use core::fmt::{argument, argumentuint}; /// let s = fmt::format(format_args!("Hello, {}!", "world")); /// assert_eq!(s, "Hello, world!".to_string()); /// ``` -#[unstable = "this is an implementation detail of format! and should not \ - be called directly"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "this is an implementation detail of format! and should not \ + be called directly")] pub fn format(args: Arguments) -> string::String { let mut output = string::String::new(); let _ = write!(&mut output, "{}", args); diff --git a/src/libstd/io/comm_adapters.rs b/src/libstd/io/comm_adapters.rs index 4b0014c68f7..2cdad79c584 100644 --- a/src/libstd/io/comm_adapters.rs +++ b/src/libstd/io/comm_adapters.rs @@ -134,7 +134,7 @@ impl ChanWriter { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Clone for ChanWriter { fn clone(&self) -> ChanWriter { ChanWriter { tx: self.tx.clone() } diff --git a/src/libstd/io/mem.rs b/src/libstd/io/mem.rs index ee05a9e5596..43d7db6cbbf 100644 --- a/src/libstd/io/mem.rs +++ b/src/libstd/io/mem.rs @@ -62,7 +62,8 @@ impl Writer for Vec { /// /// assert_eq!(w.into_inner(), vec!(0, 1, 2)); /// ``` -#[deprecated = "use the Vec Writer implementation directly"] +#[deprecated(feature = "oldstuff", since = "1.0.0", + reason = "use the Vec Writer implementation directly")] #[derive(Clone)] pub struct MemWriter { buf: Vec, diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs index dc21416df7b..f680f896238 100644 --- a/src/libstd/io/mod.rs +++ b/src/libstd/io/mod.rs @@ -219,7 +219,7 @@ //! concerned with error handling; instead its caller is responsible for //! responding to errors that may occur while attempting to read the numbers. -#![unstable] +#![unstable(feature = "unnamed_feature", since = "1.0.0")] #![deny(unused_must_use)] pub use self::SeekStyle::*; @@ -1744,7 +1744,7 @@ pub struct FileStat { /// /// Usage of this field is discouraged, but if access is desired then the /// fields are located here. - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] pub unstable: UnstableFileStat, } @@ -1752,7 +1752,7 @@ pub struct FileStat { /// returned from a `stat` syscall which is not contained in the `FileStat` /// structure. This information is not necessarily platform independent, and may /// have different meanings or no meaning at all on some platforms. -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] #[derive(Copy, Hash)] pub struct UnstableFileStat { /// The ID of the device containing the file. @@ -1815,9 +1815,9 @@ bitflags! { } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Default for FilePermission { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] #[inline] fn default() -> FilePermission { FilePermission::empty() } } diff --git a/src/libstd/io/net/pipe.rs b/src/libstd/io/net/pipe.rs index 61d164d21e3..6705b22c92f 100644 --- a/src/libstd/io/net/pipe.rs +++ b/src/libstd/io/net/pipe.rs @@ -68,7 +68,8 @@ impl UnixStream { /// /// If a `timeout` with zero or negative duration is specified then /// the function returns `Err`, with the error kind set to `TimedOut`. - #[unstable = "the timeout argument is likely to change types"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "the timeout argument is likely to change types")] pub fn connect_timeout

(path: P, timeout: Duration) -> IoResult where P: BytesContainer { @@ -107,7 +108,8 @@ impl UnixStream { /// Sets the read/write timeout for this socket. /// /// For more information, see `TcpStream::set_timeout` - #[unstable = "the timeout argument may change in type and value"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "the timeout argument may change in type and value")] pub fn set_timeout(&mut self, timeout_ms: Option) { self.inner.set_timeout(timeout_ms) } @@ -115,7 +117,8 @@ impl UnixStream { /// Sets the read timeout for this socket. /// /// For more information, see `TcpStream::set_timeout` - #[unstable = "the timeout argument may change in type and value"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "the timeout argument may change in type and value")] pub fn set_read_timeout(&mut self, timeout_ms: Option) { self.inner.set_read_timeout(timeout_ms) } @@ -123,7 +126,8 @@ impl UnixStream { /// Sets the write timeout for this socket. /// /// For more information, see `TcpStream::set_timeout` - #[unstable = "the timeout argument may change in type and value"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "the timeout argument may change in type and value")] pub fn set_write_timeout(&mut self, timeout_ms: Option) { self.inner.set_write_timeout(timeout_ms) } @@ -217,8 +221,9 @@ impl UnixAcceptor { /// When using this method, it is likely necessary to reset the timeout as /// appropriate, the timeout specified is specific to this object, not /// specific to the next request. - #[unstable = "the name and arguments to this function are likely \ - to change"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "the name and arguments to this function are likely \ + to change")] pub fn set_timeout(&mut self, timeout_ms: Option) { self.inner.set_timeout(timeout_ms) } @@ -227,7 +232,7 @@ impl UnixAcceptor { /// /// This function has the same semantics as `TcpAcceptor::close_accept`, and /// more information can be found in that documentation. - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn close_accept(&mut self) -> IoResult<()> { self.inner.close_accept() } diff --git a/src/libstd/io/net/tcp.rs b/src/libstd/io/net/tcp.rs index 4978085fa4f..180deae6a25 100644 --- a/src/libstd/io/net/tcp.rs +++ b/src/libstd/io/net/tcp.rs @@ -85,7 +85,8 @@ impl TcpStream { /// /// If a `timeout` with zero or negative duration is specified then /// the function returns `Err`, with the error kind set to `TimedOut`. - #[unstable = "the timeout argument may eventually change types"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "the timeout argument may eventually change types")] pub fn connect_timeout(addr: A, timeout: Duration) -> IoResult { if timeout <= Duration::milliseconds(0) { @@ -109,7 +110,7 @@ impl TcpStream { } /// Sets the nodelay flag on this connection to the boolean specified - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn set_nodelay(&mut self, nodelay: bool) -> IoResult<()> { self.inner.set_nodelay(nodelay) } @@ -119,7 +120,7 @@ impl TcpStream { /// If the value specified is `None`, then the keepalive flag is cleared on /// this connection. Otherwise, the keepalive timeout will be set to the /// specified time, in seconds. - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn set_keepalive(&mut self, delay_in_seconds: Option) -> IoResult<()> { self.inner.set_keepalive(delay_in_seconds) } @@ -187,7 +188,8 @@ impl TcpStream { /// /// For clarification on the semantics of interrupting a read and a write, /// take a look at `set_read_timeout` and `set_write_timeout`. - #[unstable = "the timeout argument may change in type and value"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "the timeout argument may change in type and value")] pub fn set_timeout(&mut self, timeout_ms: Option) { self.inner.set_timeout(timeout_ms) } @@ -204,7 +206,8 @@ impl TcpStream { /// action is taken. Otherwise, the read operation will be scheduled to /// promptly return. If a timeout error is returned, then no data was read /// during the timeout period. - #[unstable = "the timeout argument may change in type and value"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "the timeout argument may change in type and value")] pub fn set_read_timeout(&mut self, timeout_ms: Option) { self.inner.set_read_timeout(timeout_ms) } @@ -231,7 +234,8 @@ impl TcpStream { /// does not know how many bytes were written as part of the timeout /// operation. It may be the case that bytes continue to be written in an /// asynchronous fashion after the call to write returns. - #[unstable = "the timeout argument may change in type and value"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "the timeout argument may change in type and value")] pub fn set_write_timeout(&mut self, timeout_ms: Option) { self.inner.set_write_timeout(timeout_ms) } @@ -395,8 +399,9 @@ impl TcpAcceptor { /// a.set_timeout(None); /// let socket = a.accept(); /// ``` - #[unstable = "the type of the argument and name of this function are \ - subject to change"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "the type of the argument and name of this function are \ + subject to change")] pub fn set_timeout(&mut self, ms: Option) { self.inner.set_timeout(ms); } /// Closes the accepting capabilities of this acceptor. @@ -442,7 +447,7 @@ impl TcpAcceptor { /// // Signal our accept loop to exit /// assert!(a.close_accept().is_ok()); /// ``` - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn close_accept(&mut self) -> IoResult<()> { self.inner.close_accept() } diff --git a/src/libstd/io/net/udp.rs b/src/libstd/io/net/udp.rs index 8cdad3f528a..a3e4eca10bc 100644 --- a/src/libstd/io/net/udp.rs +++ b/src/libstd/io/net/udp.rs @@ -92,13 +92,13 @@ impl UdpSocket { } /// Joins a multicast IP address (becomes a member of it) - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn join_multicast(&mut self, multi: IpAddr) -> IoResult<()> { self.inner.join_multicast(multi) } /// Leaves a multicast IP address (drops membership from it) - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn leave_multicast(&mut self, multi: IpAddr) -> IoResult<()> { self.inner.leave_multicast(multi) } @@ -106,25 +106,25 @@ impl UdpSocket { /// Set the multicast loop flag to the specified value /// /// This lets multicast packets loop back to local sockets (if enabled) - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn set_multicast_loop(&mut self, on: bool) -> IoResult<()> { self.inner.set_multicast_loop(on) } /// Sets the multicast TTL - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn set_multicast_ttl(&mut self, ttl: int) -> IoResult<()> { self.inner.multicast_time_to_live(ttl) } /// Sets this socket's TTL - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn set_ttl(&mut self, ttl: int) -> IoResult<()> { self.inner.time_to_live(ttl) } /// Sets the broadcast flag on or off - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn set_broadcast(&mut self, broadcast: bool) -> IoResult<()> { self.inner.set_broadcast(broadcast) } @@ -132,7 +132,8 @@ impl UdpSocket { /// Sets the read/write timeout for this socket. /// /// For more information, see `TcpStream::set_timeout` - #[unstable = "the timeout argument may change in type and value"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "the timeout argument may change in type and value")] pub fn set_timeout(&mut self, timeout_ms: Option) { self.inner.set_timeout(timeout_ms) } @@ -140,7 +141,8 @@ impl UdpSocket { /// Sets the read timeout for this socket. /// /// For more information, see `TcpStream::set_timeout` - #[unstable = "the timeout argument may change in type and value"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "the timeout argument may change in type and value")] pub fn set_read_timeout(&mut self, timeout_ms: Option) { self.inner.set_read_timeout(timeout_ms) } @@ -148,7 +150,8 @@ impl UdpSocket { /// Sets the write timeout for this socket. /// /// For more information, see `TcpStream::set_timeout` - #[unstable = "the timeout argument may change in type and value"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "the timeout argument may change in type and value")] pub fn set_write_timeout(&mut self, timeout_ms: Option) { self.inner.set_write_timeout(timeout_ms) } diff --git a/src/libstd/io/process.rs b/src/libstd/io/process.rs index 43ca7b13145..4762719a04e 100644 --- a/src/libstd/io/process.rs +++ b/src/libstd/io/process.rs @@ -691,7 +691,8 @@ impl Process { /// p.wait() /// } /// ``` - #[unstable = "the type of the timeout is likely to change"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "the type of the timeout is likely to change")] pub fn set_timeout(&mut self, timeout_ms: Option) { self.deadline = timeout_ms.map(|i| i + sys::timer::now()).unwrap_or(0); } diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 648326eee99..a86a6eb4bfe 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -95,7 +95,7 @@ //! and `format!`, also available to all Rust code. #![crate_name = "std"] -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] #![staged_api] #![crate_type = "rlib"] #![crate_type = "dylib"] @@ -175,7 +175,7 @@ pub use alloc::rc; pub use core_collections::slice; pub use core_collections::str; pub use core_collections::string; -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub use core_collections::vec; pub use unicode::char; diff --git a/src/libstd/macros.rs b/src/libstd/macros.rs index 8a8d14c4f3a..16d11077080 100644 --- a/src/libstd/macros.rs +++ b/src/libstd/macros.rs @@ -14,7 +14,7 @@ //! library. Each macro is available for use when linking against the standard //! library. -#![unstable] +#![unstable(feature = "unnamed_feature", since = "1.0.0")] /// The entry point for panic of Rust tasks. /// @@ -36,7 +36,7 @@ /// panic!("this is a {} {message}", "fancy", message = "message"); /// ``` #[macro_export] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] macro_rules! panic { () => ({ panic!("explicit panic") @@ -71,7 +71,7 @@ macro_rules! panic { /// format!("x = {}, y = {y}", 10i, y = 30i); /// ``` #[macro_export] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] macro_rules! format { ($($arg:tt)*) => ($crate::fmt::format(format_args!($($arg)*))) } @@ -79,7 +79,7 @@ macro_rules! format { /// Equivalent to the `println!` macro except that a newline is not printed at /// the end of the message. #[macro_export] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] macro_rules! print { ($($arg:tt)*) => ($crate::io::stdio::print_args(format_args!($($arg)*))) } @@ -97,7 +97,7 @@ macro_rules! print { /// println!("format {} arguments", "some"); /// ``` #[macro_export] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] macro_rules! println { ($($arg:tt)*) => ($crate::io::stdio::println_args(format_args!($($arg)*))) } @@ -106,7 +106,7 @@ macro_rules! println { /// error if the value of the expression is `Err`. For more information, see /// `std::io`. #[macro_export] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] macro_rules! try { ($expr:expr) => (match $expr { $crate::result::Result::Ok(val) => val, @@ -148,7 +148,7 @@ macro_rules! try { /// /// For more information about select, see the `std::sync::mpsc::Select` structure. #[macro_export] -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] macro_rules! select { ( $($name:pat = $rx:ident.$meth:ident() => $code:expr),+ diff --git a/src/libstd/num/f32.rs b/src/libstd/num/f32.rs index adbce893887..a9e40e96332 100644 --- a/src/libstd/num/f32.rs +++ b/src/libstd/num/f32.rs @@ -10,7 +10,7 @@ //! Operations and constants for 32-bits floats (`f32` type) -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] #![allow(missing_docs)] #![allow(unsigned_negation)] #![doc(primitive = "f32")] @@ -73,7 +73,7 @@ mod cmath { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Float for f32 { #[inline] fn nan() -> f32 { num::Float::nan() } @@ -366,7 +366,7 @@ impl Float for f32 { /// /// * num - The float value #[inline] -#[unstable = "may be removed or relocated"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "may be removed or relocated")] pub fn to_string(num: f32) -> String { let (r, _) = strconv::float_to_str_common( num, 10u, true, SignNeg, DigAll, ExpNone, false); @@ -379,7 +379,7 @@ pub fn to_string(num: f32) -> String { /// /// * num - The float value #[inline] -#[unstable = "may be removed or relocated"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "may be removed or relocated")] pub fn to_str_hex(num: f32) -> String { let (r, _) = strconv::float_to_str_common( num, 16u, true, SignNeg, DigAll, ExpNone, false); @@ -394,7 +394,7 @@ pub fn to_str_hex(num: f32) -> String { /// * num - The float value /// * radix - The base to use #[inline] -#[unstable = "may be removed or relocated"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "may be removed or relocated")] pub fn to_str_radix_special(num: f32, rdx: uint) -> (String, bool) { strconv::float_to_str_common(num, rdx, true, SignNeg, DigAll, ExpNone, false) } @@ -407,7 +407,7 @@ pub fn to_str_radix_special(num: f32, rdx: uint) -> (String, bool) { /// * num - The float value /// * digits - The number of significant digits #[inline] -#[unstable = "may be removed or relocated"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "may be removed or relocated")] pub fn to_str_exact(num: f32, dig: uint) -> String { let (r, _) = strconv::float_to_str_common( num, 10u, true, SignNeg, DigExact(dig), ExpNone, false); @@ -422,7 +422,7 @@ pub fn to_str_exact(num: f32, dig: uint) -> String { /// * num - The float value /// * digits - The number of significant digits #[inline] -#[unstable = "may be removed or relocated"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "may be removed or relocated")] pub fn to_str_digits(num: f32, dig: uint) -> String { let (r, _) = strconv::float_to_str_common( num, 10u, true, SignNeg, DigMax(dig), ExpNone, false); @@ -438,7 +438,7 @@ pub fn to_str_digits(num: f32, dig: uint) -> String { /// * digits - The number of digits after the decimal point /// * upper - Use `E` instead of `e` for the exponent sign #[inline] -#[unstable = "may be removed or relocated"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "may be removed or relocated")] pub fn to_str_exp_exact(num: f32, dig: uint, upper: bool) -> String { let (r, _) = strconv::float_to_str_common( num, 10u, true, SignNeg, DigExact(dig), ExpDec, upper); @@ -454,7 +454,7 @@ pub fn to_str_exp_exact(num: f32, dig: uint, upper: bool) -> String { /// * digits - The number of digits after the decimal point /// * upper - Use `E` instead of `e` for the exponent sign #[inline] -#[unstable = "may be removed or relocated"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "may be removed or relocated")] pub fn to_str_exp_digits(num: f32, dig: uint, upper: bool) -> String { let (r, _) = strconv::float_to_str_common( num, 10u, true, SignNeg, DigMax(dig), ExpDec, upper); diff --git a/src/libstd/num/f64.rs b/src/libstd/num/f64.rs index baff14125ee..ae5db0b1fd8 100644 --- a/src/libstd/num/f64.rs +++ b/src/libstd/num/f64.rs @@ -10,7 +10,7 @@ //! Operations and constants for 64-bits floats (`f64` type) -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] #![allow(missing_docs)] #![doc(primitive = "f64")] @@ -81,7 +81,7 @@ mod cmath { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Float for f64 { // inlined methods from `num::Float` #[inline] @@ -375,7 +375,7 @@ impl Float for f64 { /// /// * num - The float value #[inline] -#[unstable = "may be removed or relocated"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "may be removed or relocated")] pub fn to_string(num: f64) -> String { let (r, _) = strconv::float_to_str_common( num, 10u, true, SignNeg, DigAll, ExpNone, false); @@ -388,7 +388,7 @@ pub fn to_string(num: f64) -> String { /// /// * num - The float value #[inline] -#[unstable = "may be removed or relocated"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "may be removed or relocated")] pub fn to_str_hex(num: f64) -> String { let (r, _) = strconv::float_to_str_common( num, 16u, true, SignNeg, DigAll, ExpNone, false); @@ -403,7 +403,7 @@ pub fn to_str_hex(num: f64) -> String { /// * num - The float value /// * radix - The base to use #[inline] -#[unstable = "may be removed or relocated"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "may be removed or relocated")] pub fn to_str_radix_special(num: f64, rdx: uint) -> (String, bool) { strconv::float_to_str_common(num, rdx, true, SignNeg, DigAll, ExpNone, false) } @@ -416,7 +416,7 @@ pub fn to_str_radix_special(num: f64, rdx: uint) -> (String, bool) { /// * num - The float value /// * digits - The number of significant digits #[inline] -#[unstable = "may be removed or relocated"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "may be removed or relocated")] pub fn to_str_exact(num: f64, dig: uint) -> String { let (r, _) = strconv::float_to_str_common( num, 10u, true, SignNeg, DigExact(dig), ExpNone, false); @@ -431,7 +431,7 @@ pub fn to_str_exact(num: f64, dig: uint) -> String { /// * num - The float value /// * digits - The number of significant digits #[inline] -#[unstable = "may be removed or relocated"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "may be removed or relocated")] pub fn to_str_digits(num: f64, dig: uint) -> String { let (r, _) = strconv::float_to_str_common( num, 10u, true, SignNeg, DigMax(dig), ExpNone, false); @@ -447,7 +447,7 @@ pub fn to_str_digits(num: f64, dig: uint) -> String { /// * digits - The number of digits after the decimal point /// * upper - Use `E` instead of `e` for the exponent sign #[inline] -#[unstable = "may be removed or relocated"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "may be removed or relocated")] pub fn to_str_exp_exact(num: f64, dig: uint, upper: bool) -> String { let (r, _) = strconv::float_to_str_common( num, 10u, true, SignNeg, DigExact(dig), ExpDec, upper); @@ -463,7 +463,7 @@ pub fn to_str_exp_exact(num: f64, dig: uint, upper: bool) -> String { /// * digits - The number of digits after the decimal point /// * upper - Use `E` instead of `e` for the exponent sign #[inline] -#[unstable = "may be removed or relocated"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "may be removed or relocated")] pub fn to_str_exp_digits(num: f64, dig: uint, upper: bool) -> String { let (r, _) = strconv::float_to_str_common( num, 10u, true, SignNeg, DigMax(dig), ExpDec, upper); diff --git a/src/libstd/num/float_macros.rs b/src/libstd/num/float_macros.rs index ec168eaaa9d..38bb62d2414 100644 --- a/src/libstd/num/float_macros.rs +++ b/src/libstd/num/float_macros.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![unstable] +#![unstable(feature = "unnamed_feature", since = "1.0.0")] #![doc(hidden)] macro_rules! assert_approx_eq { diff --git a/src/libstd/num/i16.rs b/src/libstd/num/i16.rs index 367147b84be..cd4e41432af 100644 --- a/src/libstd/num/i16.rs +++ b/src/libstd/num/i16.rs @@ -10,7 +10,7 @@ //! Operations and constants for signed 16-bits integers (`i16` type) -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] #![doc(primitive = "i16")] pub use core::i16::{BITS, BYTES, MIN, MAX}; diff --git a/src/libstd/num/i32.rs b/src/libstd/num/i32.rs index 19fb40c9644..89f3ab81c94 100644 --- a/src/libstd/num/i32.rs +++ b/src/libstd/num/i32.rs @@ -10,7 +10,7 @@ //! Operations and constants for signed 32-bits integers (`i32` type) -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] #![doc(primitive = "i32")] pub use core::i32::{BITS, BYTES, MIN, MAX}; diff --git a/src/libstd/num/i64.rs b/src/libstd/num/i64.rs index 2379b03c64f..6c866382ed3 100644 --- a/src/libstd/num/i64.rs +++ b/src/libstd/num/i64.rs @@ -10,7 +10,7 @@ //! Operations and constants for signed 64-bits integers (`i64` type) -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] #![doc(primitive = "i64")] pub use core::i64::{BITS, BYTES, MIN, MAX}; diff --git a/src/libstd/num/i8.rs b/src/libstd/num/i8.rs index a09ceefc6a0..521b24cdf73 100644 --- a/src/libstd/num/i8.rs +++ b/src/libstd/num/i8.rs @@ -10,7 +10,7 @@ //! Operations and constants for signed 8-bits integers (`i8` type) -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] #![doc(primitive = "i8")] pub use core::i8::{BITS, BYTES, MIN, MAX}; diff --git a/src/libstd/num/int.rs b/src/libstd/num/int.rs index 69439f85115..2bf9f9b025d 100644 --- a/src/libstd/num/int.rs +++ b/src/libstd/num/int.rs @@ -14,7 +14,7 @@ //! alpha cycle along with the development of clearer conventions //! around integer types. -#![deprecated = "replaced by isize"] +#![deprecated(feature = "oldstuff", since = "1.0.0", reason = "replaced by isize")] pub use core::int::{BITS, BYTES, MIN, MAX}; diff --git a/src/libstd/num/int_macros.rs b/src/libstd/num/int_macros.rs index 5bc54152874..640d814c046 100644 --- a/src/libstd/num/int_macros.rs +++ b/src/libstd/num/int_macros.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![unstable] +#![unstable(feature = "unnamed_feature", since = "1.0.0")] #![doc(hidden)] macro_rules! int_module { ($T:ty) => ( diff --git a/src/libstd/num/isize.rs b/src/libstd/num/isize.rs index 22395a1c0ff..c0ae4d6a2cd 100644 --- a/src/libstd/num/isize.rs +++ b/src/libstd/num/isize.rs @@ -14,7 +14,7 @@ //! new type will gradually take place over the alpha cycle along with //! the development of clearer conventions around integer types. -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] #![doc(primitive = "isize")] pub use core::isize::{BITS, BYTES, MIN, MAX}; diff --git a/src/libstd/num/mod.rs b/src/libstd/num/mod.rs index 3432767d6cd..82363a8e169 100644 --- a/src/libstd/num/mod.rs +++ b/src/libstd/num/mod.rs @@ -13,7 +13,7 @@ //! These are implemented for the primitive numeric types in `std::{u8, u16, //! u32, u64, uint, i8, i16, i32, i64, int, f32, f64}`. -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] #![allow(missing_docs)] #[cfg(test)] use fmt::Show; @@ -33,11 +33,11 @@ pub use core::num::{FpCategory}; use option::Option; -#[unstable = "may be removed or relocated"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "may be removed or relocated")] pub mod strconv; /// Mathematical operations on primitive floating point numbers. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub trait Float : Copy + Clone + NumCast @@ -52,172 +52,193 @@ pub trait Float { // inlined methods from `num::Float` /// Returns the NaN value. - #[unstable = "unsure about its place in the world"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "unsure about its place in the world")] fn nan() -> Self; /// Returns the infinite value. - #[unstable = "unsure about its place in the world"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "unsure about its place in the world")] fn infinity() -> Self; /// Returns the negative infinite value. - #[unstable = "unsure about its place in the world"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "unsure about its place in the world")] fn neg_infinity() -> Self; /// Returns the `0` value. - #[unstable = "unsure about its place in the world"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "unsure about its place in the world")] fn zero() -> Self; /// Returns -0.0. - #[unstable = "unsure about its place in the world"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "unsure about its place in the world")] fn neg_zero() -> Self; /// Returns the `1` value. - #[unstable = "unsure about its place in the world"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "unsure about its place in the world")] fn one() -> Self; // FIXME (#5527): These should be associated constants /// Returns the number of binary digits of mantissa that this type supports. - #[deprecated = "use `std::f32::MANTISSA_DIGITS` or `std::f64::MANTISSA_DIGITS` as appropriate"] + #[deprecated(feature = "oldstuff", since = "1.0.0", + reason = "use `std::f32::MANTISSA_DIGITS` or \ + `std::f64::MANTISSA_DIGITS` as appropriate")] fn mantissa_digits(unused_self: Option) -> uint; /// Returns the number of base-10 digits of precision that this type supports. - #[deprecated = "use `std::f32::DIGITS` or `std::f64::DIGITS` as appropriate"] + #[deprecated(feature = "oldstuff", since = "1.0.0", + reason = "use `std::f32::DIGITS` or `std::f64::DIGITS` as appropriate")] fn digits(unused_self: Option) -> uint; /// Returns the difference between 1.0 and the smallest representable number larger than 1.0. - #[deprecated = "use `std::f32::EPSILON` or `std::f64::EPSILON` as appropriate"] + #[deprecated(feature = "oldstuff", since = "1.0.0", + reason = "use `std::f32::EPSILON` or `std::f64::EPSILON` as appropriate")] fn epsilon() -> Self; /// Returns the minimum binary exponent that this type can represent. - #[deprecated = "use `std::f32::MIN_EXP` or `std::f64::MIN_EXP` as appropriate"] + #[deprecated(feature = "oldstuff", since = "1.0.0", + reason = "use `std::f32::MIN_EXP` or `std::f64::MIN_EXP` as appropriate")] fn min_exp(unused_self: Option) -> int; /// Returns the maximum binary exponent that this type can represent. - #[deprecated = "use `std::f32::MAX_EXP` or `std::f64::MAX_EXP` as appropriate"] + #[deprecated(feature = "oldstuff", since = "1.0.0", + reason = "use `std::f32::MAX_EXP` or `std::f64::MAX_EXP` as appropriate")] fn max_exp(unused_self: Option) -> int; /// Returns the minimum base-10 exponent that this type can represent. - #[deprecated = "use `std::f32::MIN_10_EXP` or `std::f64::MIN_10_EXP` as appropriate"] + #[deprecated(feature = "oldstuff", since = "1.0.0", + reason = "use `std::f32::MIN_10_EXP` or `std::f64::MIN_10_EXP` as appropriate")] fn min_10_exp(unused_self: Option) -> int; /// Returns the maximum base-10 exponent that this type can represent. - #[deprecated = "use `std::f32::MAX_10_EXP` or `std::f64::MAX_10_EXP` as appropriate"] + #[deprecated(feature = "oldstuff", since = "1.0.0", + reason = "use `std::f32::MAX_10_EXP` or `std::f64::MAX_10_EXP` as appropriate")] fn max_10_exp(unused_self: Option) -> int; /// Returns the smallest finite value that this type can represent. - #[unstable = "unsure about its place in the world"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "unsure about its place in the world")] fn min_value() -> Self; /// Returns the smallest normalized positive number that this type can represent. - #[unstable = "unsure about its place in the world"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "unsure about its place in the world")] fn min_pos_value(unused_self: Option) -> Self; /// Returns the largest finite value that this type can represent. - #[unstable = "unsure about its place in the world"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "unsure about its place in the world")] fn max_value() -> Self; /// Returns true if this value is NaN and false otherwise. - #[unstable = "position is undecided"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "position is undecided")] fn is_nan(self) -> bool; /// Returns true if this value is positive infinity or negative infinity and /// false otherwise. - #[unstable = "position is undecided"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "position is undecided")] fn is_infinite(self) -> bool; /// Returns true if this number is neither infinite nor NaN. - #[unstable = "position is undecided"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "position is undecided")] fn is_finite(self) -> bool; /// Returns true if this number is neither zero, infinite, denormal, or NaN. - #[unstable = "position is undecided"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "position is undecided")] fn is_normal(self) -> bool; /// Returns the category that this number falls into. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn classify(self) -> FpCategory; /// Returns the mantissa, exponent and sign as integers, respectively. - #[unstable = "signature is undecided"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "signature is undecided")] fn integer_decode(self) -> (u64, i16, i8); /// Return the largest integer less than or equal to a number. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn floor(self) -> Self; /// Return the smallest integer greater than or equal to a number. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn ceil(self) -> Self; /// Return the nearest integer to a number. Round half-way cases away from /// `0.0`. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn round(self) -> Self; /// Return the integer part of a number. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn trunc(self) -> Self; /// Return the fractional part of a number. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn fract(self) -> Self; /// Computes the absolute value of `self`. Returns `Float::nan()` if the /// number is `Float::nan()`. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn abs(self) -> Self; /// Returns a number that represents the sign of `self`. /// /// - `1.0` if the number is positive, `+0.0` or `Float::infinity()` /// - `-1.0` if the number is negative, `-0.0` or `Float::neg_infinity()` /// - `Float::nan()` if the number is `Float::nan()` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn signum(self) -> Self; /// Returns `true` if `self` is positive, including `+0.0` and /// `Float::infinity()`. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn is_positive(self) -> bool; /// Returns `true` if `self` is negative, including `-0.0` and /// `Float::neg_infinity()`. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn is_negative(self) -> bool; /// Fused multiply-add. Computes `(self * a) + b` with only one rounding /// error. This produces a more accurate result with better performance than /// a separate multiplication operation followed by an add. - #[unstable = "unsure about its place in the world"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "unsure about its place in the world")] fn mul_add(self, a: Self, b: Self) -> Self; /// Take the reciprocal (inverse) of a number, `1/x`. - #[unstable = "unsure about its place in the world"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "unsure about its place in the world")] fn recip(self) -> Self; /// Raise a number to an integer power. /// /// Using this function is generally faster than using `powf` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn powi(self, n: i32) -> Self; /// Raise a number to a floating point power. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn powf(self, n: Self) -> Self; /// Take the square root of a number. /// /// Returns NaN if `self` is a negative number. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn sqrt(self) -> Self; /// Take the reciprocal (inverse) square root of a number, `1/sqrt(x)`. - #[unstable = "unsure about its place in the world"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "unsure about its place in the world")] fn rsqrt(self) -> Self; /// Returns `e^(self)`, (the exponential function). - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn exp(self) -> Self; /// Returns 2 raised to the power of the number, `2^(self)`. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn exp2(self) -> Self; /// Returns the natural logarithm of the number. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn ln(self) -> Self; /// Returns the logarithm of the number with respect to an arbitrary base. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn log(self, base: Self) -> Self; /// Returns the base 2 logarithm of the number. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn log2(self) -> Self; /// Returns the base 10 logarithm of the number. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn log10(self) -> Self; /// Convert radians to degrees. - #[unstable = "desirability is unclear"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "desirability is unclear")] fn to_degrees(self) -> Self; /// Convert degrees to radians. - #[unstable = "desirability is unclear"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "desirability is unclear")] fn to_radians(self) -> Self; /// Constructs a floating point number created by multiplying `x` by 2 /// raised to the power of `exp`. - #[unstable = "pending integer conventions"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "pending integer conventions")] fn ldexp(x: Self, exp: int) -> Self; /// Breaks the number into a normalized fraction and a base-2 exponent, /// satisfying: @@ -225,94 +246,97 @@ pub trait Float /// * `self = x * pow(2, exp)` /// /// * `0.5 <= abs(x) < 1.0` - #[unstable = "pending integer conventions"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "pending integer conventions")] fn frexp(self) -> (Self, int); /// Returns the next representable floating-point value in the direction of /// `other`. - #[unstable = "unsure about its place in the world"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "unsure about its place in the world")] fn next_after(self, other: Self) -> Self; /// Returns the maximum of the two numbers. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn max(self, other: Self) -> Self; /// Returns the minimum of the two numbers. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn min(self, other: Self) -> Self; /// The positive difference of two numbers. Returns `0.0` if the number is /// less than or equal to `other`, otherwise the difference between`self` /// and `other` is returned. - #[unstable = "may be renamed"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "may be renamed")] fn abs_sub(self, other: Self) -> Self; /// Take the cubic root of a number. - #[unstable = "may be renamed"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "may be renamed")] fn cbrt(self) -> Self; /// Calculate the length of the hypotenuse of a right-angle triangle given /// legs of length `x` and `y`. - #[unstable = "unsure about its place in the world"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "unsure about its place in the world")] fn hypot(self, other: Self) -> Self; /// Computes the sine of a number (in radians). - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn sin(self) -> Self; /// Computes the cosine of a number (in radians). - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn cos(self) -> Self; /// Computes the tangent of a number (in radians). - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn tan(self) -> Self; /// Computes the arcsine of a number. Return value is in radians in /// the range [-pi/2, pi/2] or NaN if the number is outside the range /// [-1, 1]. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn asin(self) -> Self; /// Computes the arccosine of a number. Return value is in radians in /// the range [0, pi] or NaN if the number is outside the range /// [-1, 1]. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn acos(self) -> Self; /// Computes the arctangent of a number. Return value is in radians in the /// range [-pi/2, pi/2]; - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn atan(self) -> Self; /// Computes the four quadrant arctangent of a number, `y`, and another /// number `x`. Return value is in radians in the range [-pi, pi]. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn atan2(self, other: Self) -> Self; /// Simultaneously computes the sine and cosine of the number, `x`. Returns /// `(sin(x), cos(x))`. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn sin_cos(self) -> (Self, Self); /// Returns the exponential of the number, minus 1, in a way that is /// accurate even if the number is close to zero. - #[unstable = "may be renamed"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "may be renamed")] fn exp_m1(self) -> Self; /// Returns the natural logarithm of the number plus 1 (`ln(1+n)`) more /// accurately than if the operations were performed separately. - #[unstable = "may be renamed"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "may be renamed")] fn ln_1p(self) -> Self; /// Hyperbolic sine function. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn sinh(self) -> Self; /// Hyperbolic cosine function. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn cosh(self) -> Self; /// Hyperbolic tangent function. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn tanh(self) -> Self; /// Inverse hyperbolic sine function. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn asinh(self) -> Self; /// Inverse hyperbolic cosine function. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn acosh(self) -> Self; /// Inverse hyperbolic tangent function. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn atanh(self) -> Self; } diff --git a/src/libstd/num/u16.rs b/src/libstd/num/u16.rs index 7cb6a8ffe07..06773a37ab5 100644 --- a/src/libstd/num/u16.rs +++ b/src/libstd/num/u16.rs @@ -10,7 +10,7 @@ //! Operations and constants for unsigned 16-bits integers (`u16` type) -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] #![doc(primitive = "u16")] pub use core::u16::{BITS, BYTES, MIN, MAX}; diff --git a/src/libstd/num/u32.rs b/src/libstd/num/u32.rs index 43b01ddb16b..a58941b00f9 100644 --- a/src/libstd/num/u32.rs +++ b/src/libstd/num/u32.rs @@ -10,7 +10,7 @@ //! Operations and constants for unsigned 32-bits integers (`u32` type) -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] #![doc(primitive = "u32")] pub use core::u32::{BITS, BYTES, MIN, MAX}; diff --git a/src/libstd/num/u64.rs b/src/libstd/num/u64.rs index 79e7f237051..2a42382dd8f 100644 --- a/src/libstd/num/u64.rs +++ b/src/libstd/num/u64.rs @@ -10,7 +10,7 @@ //! Operations and constants for unsigned 64-bits integer (`u64` type) -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] #![doc(primitive = "u64")] pub use core::u64::{BITS, BYTES, MIN, MAX}; diff --git a/src/libstd/num/u8.rs b/src/libstd/num/u8.rs index 3da2fabe3f2..952c8c0347f 100644 --- a/src/libstd/num/u8.rs +++ b/src/libstd/num/u8.rs @@ -10,7 +10,7 @@ //! Operations and constants for unsigned 8-bits integers (`u8` type) -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] #![doc(primitive = "u8")] pub use core::u8::{BITS, BYTES, MIN, MAX}; diff --git a/src/libstd/num/uint.rs b/src/libstd/num/uint.rs index 0e12eff205f..58685b05981 100644 --- a/src/libstd/num/uint.rs +++ b/src/libstd/num/uint.rs @@ -14,7 +14,7 @@ //! alpha cycle along with the development of clearer conventions //! around integer types. -#![deprecated = "replaced by usize"] +#![deprecated(feature = "oldstuff", since = "1.0.0", reason = "replaced by usize")] pub use core::uint::{BITS, BYTES, MIN, MAX}; diff --git a/src/libstd/num/uint_macros.rs b/src/libstd/num/uint_macros.rs index f480a3b420f..786912f0028 100644 --- a/src/libstd/num/uint_macros.rs +++ b/src/libstd/num/uint_macros.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![unstable] +#![unstable(feature = "unnamed_feature", since = "1.0.0")] #![doc(hidden)] #![allow(unsigned_negation)] diff --git a/src/libstd/num/usize.rs b/src/libstd/num/usize.rs index 74dd38e13c5..52601a92ed4 100644 --- a/src/libstd/num/usize.rs +++ b/src/libstd/num/usize.rs @@ -14,7 +14,7 @@ //! new type will gradually take place over the alpha cycle along with //! the development of clearer conventions around integer types. -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] #![doc(primitive = "usize")] pub use core::usize::{BITS, BYTES, MIN, MAX}; diff --git a/src/libstd/os.rs b/src/libstd/os.rs index 78db6c158a8..2b5748604d1 100644 --- a/src/libstd/os.rs +++ b/src/libstd/os.rs @@ -22,7 +22,7 @@ //! so we will not _hide_ the facts of which OS the user is on -- they should be given the //! opportunity to write OS-ignorant code by default. -#![unstable] +#![unstable(feature = "unnamed_feature", since = "1.0.0")] #![allow(missing_docs)] #![allow(non_snake_case)] diff --git a/src/libstd/path/mod.rs b/src/libstd/path/mod.rs index 541f1e77140..2a21f449551 100644 --- a/src/libstd/path/mod.rs +++ b/src/libstd/path/mod.rs @@ -59,7 +59,7 @@ //! println!("path exists: {}", path.exists()); //! ``` -#![unstable] +#![unstable(feature = "unnamed_feature", since = "1.0.0")] use core::marker::Sized; use ffi::CString; diff --git a/src/libstd/prelude/mod.rs b/src/libstd/prelude/mod.rs index 0496944dbaf..7e53f45422d 100644 --- a/src/libstd/prelude/mod.rs +++ b/src/libstd/prelude/mod.rs @@ -35,7 +35,7 @@ //! pervasive that it would be obnoxious to import for every use, particularly //! those that define methods on primitive types. -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub mod v1; diff --git a/src/libstd/prelude/v1.rs b/src/libstd/prelude/v1.rs index d9c942c0185..e0302c54a5a 100644 --- a/src/libstd/prelude/v1.rs +++ b/src/libstd/prelude/v1.rs @@ -10,35 +10,54 @@ //! The first version of the prelude of the standard library. -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] // Reexported core operators -#[stable] #[doc(no_inline)] pub use marker::{Copy, Send, Sized, Sync}; -#[stable] #[doc(no_inline)] pub use ops::{Drop, Fn, FnMut, FnOnce}; +#[stable(feature = "grandfathered", since = "1.0.0")] +#[doc(no_inline)] pub use marker::{Copy, Send, Sized, Sync}; +#[stable(feature = "grandfathered", since = "1.0.0")] +#[doc(no_inline)] pub use ops::{Drop, Fn, FnMut, FnOnce}; // TEMPORARY -#[unstable] #[doc(no_inline)] pub use ops::FullRange; +#[unstable(feature = "unnamed_feature", since = "1.0.0")] +#[doc(no_inline)] pub use ops::FullRange; // Reexported functions -#[stable] #[doc(no_inline)] pub use mem::drop; +#[stable(feature = "grandfathered", since = "1.0.0")] +#[doc(no_inline)] pub use mem::drop; // Reexported types and traits -#[stable] #[doc(no_inline)] pub use boxed::Box; -#[stable] #[doc(no_inline)] pub use char::CharExt; -#[stable] #[doc(no_inline)] pub use clone::Clone; -#[stable] #[doc(no_inline)] pub use cmp::{PartialEq, PartialOrd, Eq, Ord}; -#[stable] #[doc(no_inline)] pub use iter::DoubleEndedIterator; -#[stable] #[doc(no_inline)] pub use iter::ExactSizeIterator; -#[stable] #[doc(no_inline)] pub use iter::{Iterator, IteratorExt, Extend}; -#[stable] #[doc(no_inline)] pub use option::Option::{self, Some, None}; -#[stable] #[doc(no_inline)] pub use ptr::{PtrExt, MutPtrExt}; -#[stable] #[doc(no_inline)] pub use result::Result::{self, Ok, Err}; -#[stable] #[doc(no_inline)] pub use slice::AsSlice; -#[stable] #[doc(no_inline)] pub use slice::{SliceExt, SliceConcatExt}; -#[stable] #[doc(no_inline)] pub use str::{Str, StrExt}; -#[stable] #[doc(no_inline)] pub use string::{String, ToString}; -#[stable] #[doc(no_inline)] pub use vec::Vec; +#[stable(feature = "grandfathered", since = "1.0.0")] +#[doc(no_inline)] pub use boxed::Box; +#[stable(feature = "grandfathered", since = "1.0.0")] +#[doc(no_inline)] pub use char::CharExt; +#[stable(feature = "grandfathered", since = "1.0.0")] +#[doc(no_inline)] pub use clone::Clone; +#[stable(feature = "grandfathered", since = "1.0.0")] +#[doc(no_inline)] pub use cmp::{PartialEq, PartialOrd, Eq, Ord}; +#[stable(feature = "grandfathered", since = "1.0.0")] +#[doc(no_inline)] pub use iter::DoubleEndedIterator; +#[stable(feature = "grandfathered", since = "1.0.0")] +#[doc(no_inline)] pub use iter::ExactSizeIterator; +#[stable(feature = "grandfathered", since = "1.0.0")] +#[doc(no_inline)] pub use iter::{Iterator, IteratorExt, Extend}; +#[stable(feature = "grandfathered", since = "1.0.0")] +#[doc(no_inline)] pub use option::Option::{self, Some, None}; +#[stable(feature = "grandfathered", since = "1.0.0")] +#[doc(no_inline)] pub use ptr::{PtrExt, MutPtrExt}; +#[stable(feature = "grandfathered", since = "1.0.0")] +#[doc(no_inline)] pub use result::Result::{self, Ok, Err}; +#[stable(feature = "grandfathered", since = "1.0.0")] +#[doc(no_inline)] pub use slice::AsSlice; +#[stable(feature = "grandfathered", since = "1.0.0")] +#[doc(no_inline)] pub use slice::{SliceExt, SliceConcatExt}; +#[stable(feature = "grandfathered", since = "1.0.0")] +#[doc(no_inline)] pub use str::{Str, StrExt}; +#[stable(feature = "grandfathered", since = "1.0.0")] +#[doc(no_inline)] pub use string::{String, ToString}; +#[stable(feature = "grandfathered", since = "1.0.0")] +#[doc(no_inline)] pub use vec::Vec; // NB: remove when path reform lands #[doc(no_inline)] pub use path::{Path, GenericPath}; diff --git a/src/libstd/rand/mod.rs b/src/libstd/rand/mod.rs index 23387d29553..24969ddb01c 100644 --- a/src/libstd/rand/mod.rs +++ b/src/libstd/rand/mod.rs @@ -219,7 +219,7 @@ //! } //! ``` -#![unstable] +#![unstable(feature = "unnamed_feature", since = "1.0.0")] use cell::RefCell; use clone::Clone; diff --git a/src/libstd/rt/mod.rs b/src/libstd/rt/mod.rs index e3e4e132b81..b4cc27ce926 100644 --- a/src/libstd/rt/mod.rs +++ b/src/libstd/rt/mod.rs @@ -16,7 +16,7 @@ //! and should be considered as private implementation details for the //! time being. -#![unstable] +#![unstable(feature = "unnamed_feature", since = "1.0.0")] // FIXME: this should not be here. #![allow(missing_docs)] diff --git a/src/libstd/rt/unwind.rs b/src/libstd/rt/unwind.rs index 73b8f104c23..1d8c7cd5910 100644 --- a/src/libstd/rt/unwind.rs +++ b/src/libstd/rt/unwind.rs @@ -582,7 +582,7 @@ fn begin_unwind_inner(msg: Box, file_line: &(&'static str, uint)) -> /// Only a limited number of callbacks can be registered, and this function /// returns whether the callback was successfully registered or not. It is not /// currently possible to unregister a callback once it has been registered. -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] pub unsafe fn register(f: Callback) -> bool { match CALLBACK_CNT.fetch_add(1, Ordering::SeqCst) { // The invocation code has knowledge of this window where the count has diff --git a/src/libstd/rtdeps.rs b/src/libstd/rtdeps.rs index f4fbd378899..4a178c7d384 100644 --- a/src/libstd/rtdeps.rs +++ b/src/libstd/rtdeps.rs @@ -12,7 +12,7 @@ //! the standard library This varies per-platform, but these libraries are //! necessary for running libstd. -#![unstable] +#![unstable(feature = "unnamed_feature", since = "1.0.0")] // All platforms need to link to rustrt #[cfg(not(test))] diff --git a/src/libstd/sync/barrier.rs b/src/libstd/sync/barrier.rs index 70939879400..c65a772da04 100644 --- a/src/libstd/sync/barrier.rs +++ b/src/libstd/sync/barrier.rs @@ -29,7 +29,7 @@ use sync::{Mutex, Condvar}; /// }); /// } /// ``` -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Barrier { lock: Mutex, cvar: Condvar, @@ -54,7 +54,7 @@ impl Barrier { /// /// A barrier will block `n`-1 threads which call `wait` and then wake up /// all threads at once when the `n`th thread calls `wait`. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn new(n: uint) -> Barrier { Barrier { lock: Mutex::new(BarrierState { @@ -75,7 +75,7 @@ impl Barrier { /// returns `true` from `is_leader` when returning from this function, and /// all other threads will receive a result that will return `false` from /// `is_leader` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn wait(&self) -> BarrierWaitResult { let mut lock = self.lock.lock().unwrap(); let local_gen = lock.generation_id; @@ -102,7 +102,7 @@ impl BarrierWaitResult { /// /// Only one thread will have `true` returned from their result, all other /// threads will have `false` returned. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn is_leader(&self) -> bool { self.0 } } diff --git a/src/libstd/sync/condvar.rs b/src/libstd/sync/condvar.rs index d2d5335078e..739e70720ca 100644 --- a/src/libstd/sync/condvar.rs +++ b/src/libstd/sync/condvar.rs @@ -58,7 +58,7 @@ use sync::{mutex, MutexGuard}; /// started = cvar.wait(started).unwrap(); /// } /// ``` -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Condvar { inner: Box } unsafe impl Send for Condvar {} @@ -76,7 +76,8 @@ unsafe impl Sync for Condvar {} /// /// static CVAR: StaticCondvar = CONDVAR_INIT; /// ``` -#[unstable = "may be merged with Condvar in the future"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "may be merged with Condvar in the future")] pub struct StaticCondvar { inner: sys::Condvar, mutex: AtomicUsize, @@ -86,7 +87,8 @@ unsafe impl Send for StaticCondvar {} unsafe impl Sync for StaticCondvar {} /// Constant initializer for a statically allocated condition variable. -#[unstable = "may be merged with Condvar in the future"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "may be merged with Condvar in the future")] pub const CONDVAR_INIT: StaticCondvar = StaticCondvar { inner: sys::CONDVAR_INIT, mutex: ATOMIC_USIZE_INIT, @@ -95,7 +97,7 @@ pub const CONDVAR_INIT: StaticCondvar = StaticCondvar { impl Condvar { /// Creates a new condition variable which is ready to be waited on and /// notified. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn new() -> Condvar { Condvar { inner: box StaticCondvar { @@ -131,7 +133,7 @@ impl Condvar { /// over time. Each condition variable is dynamically bound to exactly one /// mutex to ensure defined behavior across platforms. If this functionality /// is not desired, then unsafe primitives in `sys` are provided. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn wait<'a, T>(&self, guard: MutexGuard<'a, T>) -> LockResult> { unsafe { @@ -154,7 +156,7 @@ impl Condvar { /// /// Like `wait`, the lock specified will be re-acquired when this function /// returns, regardless of whether the timeout elapsed or not. - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn wait_timeout<'a, T>(&self, guard: MutexGuard<'a, T>, dur: Duration) -> LockResult<(MutexGuard<'a, T>, bool)> { unsafe { @@ -169,7 +171,7 @@ impl Condvar { /// The semantics of this function are equivalent to `wait_timeout` except /// that the implementation will repeatedly wait while the duration has not /// passed and the provided function returns `false`. - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn wait_timeout_with<'a, T, F>(&self, guard: MutexGuard<'a, T>, dur: Duration, @@ -189,7 +191,7 @@ impl Condvar { /// `notify_one` are not buffered in any way. /// /// To wake up all threads, see `notify_all()`. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn notify_one(&self) { unsafe { self.inner.inner.notify_one() } } /// Wake up all blocked threads on this condvar. @@ -199,11 +201,11 @@ impl Condvar { /// way. /// /// To wake up only one thread, see `notify_one()`. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn notify_all(&self) { unsafe { self.inner.inner.notify_all() } } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Drop for Condvar { fn drop(&mut self) { unsafe { self.inner.inner.destroy() } @@ -215,7 +217,8 @@ impl StaticCondvar { /// notification. /// /// See `Condvar::wait`. - #[unstable = "may be merged with Condvar in the future"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "may be merged with Condvar in the future")] pub fn wait<'a, T>(&'static self, guard: MutexGuard<'a, T>) -> LockResult> { let poisoned = unsafe { @@ -235,7 +238,8 @@ impl StaticCondvar { /// specified duration. /// /// See `Condvar::wait_timeout`. - #[unstable = "may be merged with Condvar in the future"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "may be merged with Condvar in the future")] pub fn wait_timeout<'a, T>(&'static self, guard: MutexGuard<'a, T>, dur: Duration) -> LockResult<(MutexGuard<'a, T>, bool)> { let (poisoned, success) = unsafe { @@ -258,7 +262,8 @@ impl StaticCondvar { /// passed and the function returns `false`. /// /// See `Condvar::wait_timeout_with`. - #[unstable = "may be merged with Condvar in the future"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "may be merged with Condvar in the future")] pub fn wait_timeout_with<'a, T, F>(&'static self, guard: MutexGuard<'a, T>, dur: Duration, @@ -298,13 +303,15 @@ impl StaticCondvar { /// Wake up one blocked thread on this condvar. /// /// See `Condvar::notify_one`. - #[unstable = "may be merged with Condvar in the future"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "may be merged with Condvar in the future")] pub fn notify_one(&'static self) { unsafe { self.inner.notify_one() } } /// Wake up all blocked threads on this condvar. /// /// See `Condvar::notify_all`. - #[unstable = "may be merged with Condvar in the future"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "may be merged with Condvar in the future")] pub fn notify_all(&'static self) { unsafe { self.inner.notify_all() } } /// Deallocate all resources associated with this static condvar. @@ -313,7 +320,8 @@ impl StaticCondvar { /// active users of the condvar, and this also doesn't prevent any future /// users of the condvar. This method is required to be called to not leak /// memory on all platforms. - #[unstable = "may be merged with Condvar in the future"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "may be merged with Condvar in the future")] pub unsafe fn destroy(&'static self) { self.inner.destroy() } diff --git a/src/libstd/sync/future.rs b/src/libstd/sync/future.rs index 36bbc5ff5b4..bb309d5c2e8 100644 --- a/src/libstd/sync/future.rs +++ b/src/libstd/sync/future.rs @@ -27,9 +27,10 @@ //! ``` #![allow(missing_docs)] -#![unstable = "futures as-is have yet to be deeply reevaluated with recent \ - core changes to Rust's synchronization story, and will likely \ - become stable in the future but are unstable until that time"] +#![unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "futures as-is have yet to be deeply reevaluated with recent \ + core changes to Rust's synchronization story, and will likely \ + become stable in the future but are unstable until that time")] use core::prelude::*; use core::mem::replace; diff --git a/src/libstd/sync/mod.rs b/src/libstd/sync/mod.rs index 6fff6765bd3..9e9d204aa46 100644 --- a/src/libstd/sync/mod.rs +++ b/src/libstd/sync/mod.rs @@ -15,7 +15,7 @@ //! and/or blocking at all, but rather provide the necessary tools to build //! other types of concurrent primitives. -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] pub use alloc::arc::{Arc, Weak}; pub use core::atomic; diff --git a/src/libstd/sync/mpsc/mod.rs b/src/libstd/sync/mpsc/mod.rs index 0ba19b70617..73ddd2e4c45 100644 --- a/src/libstd/sync/mpsc/mod.rs +++ b/src/libstd/sync/mpsc/mod.rs @@ -163,7 +163,7 @@ //! } //! ``` -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] // A description of how Rust's channel implementation works // @@ -339,7 +339,7 @@ mod spsc_queue; /// The receiving-half of Rust's channel type. This half can only be owned by /// one task -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Receiver { inner: UnsafeCell>, } @@ -351,14 +351,14 @@ unsafe impl Send for Receiver { } /// An iterator over messages on a receiver, this iterator will block /// whenever `next` is called, waiting for a new message, and `None` will be /// returned when the corresponding channel has hung up. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Iter<'a, T:'a> { rx: &'a Receiver } /// The sending-half of Rust's asynchronous channel type. This half can only be /// owned by one task, but it can be cloned to send to other tasks. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Sender { inner: UnsafeCell>, } @@ -369,8 +369,8 @@ unsafe impl Send for Sender { } /// The sending-half of Rust's synchronous channel type. This half can only be /// owned by one task, but it can be cloned to send to other tasks. -#[stable] #[cfg(stage0)] // NOTE remove impl after next snapshot +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct SyncSender { inner: Arc>>, // can't share in an arc @@ -379,7 +379,7 @@ pub struct SyncSender { /// The sending-half of Rust's synchronous channel type. This half can only be /// owned by one task, but it can be cloned to send to other tasks. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] #[cfg(not(stage0))] // NOTE remove cfg after next snapshot pub struct SyncSender { inner: Arc>>, @@ -394,7 +394,7 @@ impl !marker::Sync for SyncSender {} /// disconnected, implying that the data could never be received. The error /// contains the data being sent as a payload so it can be recovered. #[derive(PartialEq, Eq)] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct SendError(pub T); /// An error returned from the `recv` function on a `Receiver`. @@ -402,29 +402,29 @@ pub struct SendError(pub T); /// The `recv` operation can only fail if the sending half of a channel is /// disconnected, implying that no further messages will ever be received. #[derive(PartialEq, Eq, Clone, Copy)] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct RecvError; /// This enumeration is the list of the possible reasons that try_recv could not /// return data when called. #[derive(PartialEq, Clone, Copy)] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub enum TryRecvError { /// This channel is currently empty, but the sender(s) have not yet /// disconnected, so data may yet become available. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] Empty, /// This channel's sending half has become disconnected, and there will /// never be any more data received on this channel - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] Disconnected, } /// This enumeration is the list of the possible error outcomes for the /// `SyncSender::try_send` method. #[derive(PartialEq, Clone)] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub enum TrySendError { /// The data could not be sent on the channel because it would require that /// the callee block to send the data. @@ -432,12 +432,12 @@ pub enum TrySendError { /// If this is a buffered channel, then the buffer is full at this time. If /// this is not a buffered channel, then there is no receiver available to /// acquire the data. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] Full(T), /// This channel's receiving half has disconnected, so the data could not be /// sent. The data is returned back to the callee in this case. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] Disconnected(T), } @@ -495,7 +495,7 @@ impl UnsafeFlavor for Receiver { /// // Let's see what that answer was /// println!("{:?}", rx.recv().unwrap()); /// ``` -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub fn channel() -> (Sender, Receiver) { let a = Arc::new(RacyCell::new(oneshot::Packet::new())); (Sender::new(Flavor::Oneshot(a.clone())), Receiver::new(Flavor::Oneshot(a))) @@ -535,7 +535,7 @@ pub fn channel() -> (Sender, Receiver) { /// assert_eq!(rx.recv().unwrap(), 1i); /// assert_eq!(rx.recv().unwrap(), 2i); /// ``` -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub fn sync_channel(bound: uint) -> (SyncSender, Receiver) { let a = Arc::new(RacyCell::new(sync::Packet::new(bound))); (SyncSender::new(a.clone()), Receiver::new(Flavor::Sync(a))) @@ -579,7 +579,7 @@ impl Sender { /// drop(rx); /// assert_eq!(tx.send(1i).err().unwrap().0, 1); /// ``` - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn send(&self, t: T) -> Result<(), SendError> { let (new_inner, ret) = match *unsafe { self.inner() } { Flavor::Oneshot(ref p) => { @@ -626,7 +626,7 @@ impl Sender { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Clone for Sender { fn clone(&self) -> Sender { let (packet, sleeper, guard) = match *unsafe { self.inner() } { @@ -672,7 +672,7 @@ impl Clone for Sender { } #[unsafe_destructor] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Drop for Sender { fn drop(&mut self) { match *unsafe { self.inner_mut() } { @@ -713,7 +713,7 @@ impl SyncSender { /// This function will never panic, but it may return `Err` if the /// `Receiver` has disconnected and is no longer able to receive /// information. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn send(&self, t: T) -> Result<(), SendError> { unsafe { (*self.inner.get()).send(t).map_err(SendError) } } @@ -727,13 +727,13 @@ impl SyncSender { /// /// See `SyncSender::send` for notes about guarantees of whether the /// receiver has received the data or not if this function is successful. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn try_send(&self, t: T) -> Result<(), TrySendError> { unsafe { (*self.inner.get()).try_send(t) } } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Clone for SyncSender { fn clone(&self) -> SyncSender { unsafe { (*self.inner.get()).clone_chan(); } @@ -742,7 +742,7 @@ impl Clone for SyncSender { } #[unsafe_destructor] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Drop for SyncSender { fn drop(&mut self) { unsafe { (*self.inner.get()).drop_chan(); } @@ -766,7 +766,7 @@ impl Receiver { /// /// This is useful for a flavor of "optimistic check" before deciding to /// block on a receiver. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn try_recv(&self) -> Result { loop { let new_port = match *unsafe { self.inner() } { @@ -827,7 +827,7 @@ impl Receiver { /// If the corresponding `Sender` has disconnected, or it disconnects while /// this call is blocking, this call will wake up and return `Err` to /// indicate that no more messages can ever be received on this channel. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn recv(&self) -> Result { loop { let new_port = match *unsafe { self.inner() } { @@ -866,7 +866,7 @@ impl Receiver { /// Returns an iterator that will block waiting for messages, but never /// `panic!`. It will return `None` when the channel has hung up. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn iter(&self) -> Iter { Iter { rx: self } } @@ -958,7 +958,7 @@ impl select::Packet for Receiver { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T: Send> Iterator for Iter<'a, T> { type Item = T; @@ -966,7 +966,7 @@ impl<'a, T: Send> Iterator for Iter<'a, T> { } #[unsafe_destructor] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Drop for Receiver { fn drop(&mut self) { match *unsafe { self.inner_mut() } { diff --git a/src/libstd/sync/mpsc/mpsc_queue.rs b/src/libstd/sync/mpsc/mpsc_queue.rs index 83de98fdbff..9747de3b7f9 100644 --- a/src/libstd/sync/mpsc/mpsc_queue.rs +++ b/src/libstd/sync/mpsc/mpsc_queue.rs @@ -35,7 +35,7 @@ //! method, and see the method for more information about it. Due to this //! caveat, this queue may not be appropriate for all use-cases. -#![unstable] +#![unstable(feature = "unnamed_feature", since = "1.0.0")] // http://www.1024cores.net/home/lock-free-algorithms // /queues/non-intrusive-mpsc-node-based-queue @@ -138,7 +138,7 @@ impl Queue { } #[unsafe_destructor] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Drop for Queue { fn drop(&mut self) { unsafe { diff --git a/src/libstd/sync/mpsc/select.rs b/src/libstd/sync/mpsc/select.rs index 62a7b823ec8..1a433db2deb 100644 --- a/src/libstd/sync/mpsc/select.rs +++ b/src/libstd/sync/mpsc/select.rs @@ -46,12 +46,13 @@ //! ``` #![allow(dead_code)] -#![unstable = "This implementation, while likely sufficient, is unsafe and \ - likely to be error prone. At some point in the future this \ - module will likely be replaced, and it is currently \ - unknown how much API breakage that will cause. The ability \ - to select over a number of channels will remain forever, \ - but no guarantees beyond this are being made"] +#![unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "This implementation, while likely sufficient, is unsafe and \ + likely to be error prone. At some point in the future this \ + module will likely be replaced, and it is currently \ + unknown how much API breakage that will cause. The ability \ + to select over a number of channels will remain forever, \ + but no guarantees beyond this are being made")] use core::prelude::*; diff --git a/src/libstd/sync/mpsc/spsc_queue.rs b/src/libstd/sync/mpsc/spsc_queue.rs index 34fd6bb70dc..cc7a34f8d4c 100644 --- a/src/libstd/sync/mpsc/spsc_queue.rs +++ b/src/libstd/sync/mpsc/spsc_queue.rs @@ -33,7 +33,7 @@ //! concurrently between two tasks. This data structure is safe to use and //! enforces the semantics that there is one pusher and one popper. -#![unstable] +#![unstable(feature = "unnamed_feature", since = "1.0.0")] use core::prelude::*; diff --git a/src/libstd/sync/mutex.rs b/src/libstd/sync/mutex.rs index 73d5332d16f..343dfbf68c7 100644 --- a/src/libstd/sync/mutex.rs +++ b/src/libstd/sync/mutex.rs @@ -109,7 +109,7 @@ use sys_common::mutex as sys; /// /// *guard += 1; /// ``` -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Mutex { // Note that this static mutex is in a *box*, not inlined into the struct // itself. Once a native mutex has been used once, its address can never @@ -145,7 +145,8 @@ unsafe impl Sync for Mutex { } /// } /// // lock is unlocked here. /// ``` -#[unstable = "may be merged with Mutex in the future"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "may be merged with Mutex in the future")] pub struct StaticMutex { lock: sys::Mutex, poison: poison::Flag, @@ -159,8 +160,8 @@ unsafe impl Sync for StaticMutex {} /// The data protected by the mutex can be access through this guard via its /// Deref and DerefMut implementations #[must_use] -#[stable] #[cfg(stage0)] // NOTE remove impl after next snapshot +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct MutexGuard<'a, T: 'a> { // funny underscores due to how Deref/DerefMut currently work (they // disregard field privacy). @@ -176,7 +177,7 @@ pub struct MutexGuard<'a, T: 'a> { /// The data protected by the mutex can be access through this guard via its /// Deref and DerefMut implementations #[must_use] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] #[cfg(not(stage0))] // NOTE remove cfg after next snapshot pub struct MutexGuard<'a, T: 'a> { // funny underscores due to how Deref/DerefMut currently work (they @@ -191,7 +192,8 @@ impl<'a, T> !marker::Send for MutexGuard<'a, T> {} /// Static initialization of a mutex. This constant can be used to initialize /// other mutex constants. -#[unstable = "may be merged with Mutex in the future"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "may be merged with Mutex in the future")] pub const MUTEX_INIT: StaticMutex = StaticMutex { lock: sys::MUTEX_INIT, poison: poison::FLAG_INIT, @@ -199,7 +201,7 @@ pub const MUTEX_INIT: StaticMutex = StaticMutex { impl Mutex { /// Creates a new mutex in an unlocked state ready for use. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn new(t: T) -> Mutex { Mutex { inner: box MUTEX_INIT, @@ -218,7 +220,7 @@ impl Mutex { /// /// If another user of this mutex panicked while holding the mutex, then /// this call will return an error once the mutex is acquired. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn lock(&self) -> LockResult> { unsafe { self.inner.lock.lock() } MutexGuard::new(&*self.inner, &self.data) @@ -237,7 +239,7 @@ impl Mutex { /// If another user of this mutex panicked while holding the mutex, then /// this call will return failure if the mutex would otherwise be /// acquired. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn try_lock(&self) -> TryLockResult> { if unsafe { self.inner.lock.try_lock() } { Ok(try!(MutexGuard::new(&*self.inner, &self.data))) @@ -248,7 +250,7 @@ impl Mutex { } #[unsafe_destructor] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Drop for Mutex { fn drop(&mut self) { // This is actually safe b/c we know that there is no further usage of @@ -265,7 +267,8 @@ static DUMMY: Dummy = Dummy(UnsafeCell { value: () }); impl StaticMutex { /// Acquires this lock, see `Mutex::lock` #[inline] - #[unstable = "may be merged with Mutex in the future"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "may be merged with Mutex in the future")] pub fn lock(&'static self) -> LockResult> { unsafe { self.lock.lock() } MutexGuard::new(self, &DUMMY.0) @@ -273,7 +276,8 @@ impl StaticMutex { /// Attempts to grab this lock, see `Mutex::try_lock` #[inline] - #[unstable = "may be merged with Mutex in the future"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "may be merged with Mutex in the future")] pub fn try_lock(&'static self) -> TryLockResult> { if unsafe { self.lock.try_lock() } { Ok(try!(MutexGuard::new(self, &DUMMY.0))) @@ -292,7 +296,8 @@ impl StaticMutex { /// *all* platforms. It may be the case that some platforms do not leak /// memory if this method is not called, but this is not guaranteed to be /// true on all platforms. - #[unstable = "may be merged with Mutex in the future"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "may be merged with Mutex in the future")] pub unsafe fn destroy(&'static self) { self.lock.destroy() } @@ -325,7 +330,7 @@ impl<'mutex, T> MutexGuard<'mutex, T> { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'mutex, T> Deref for MutexGuard<'mutex, T> { type Target = T; @@ -333,7 +338,7 @@ impl<'mutex, T> Deref for MutexGuard<'mutex, T> { unsafe { &*self.__data.get() } } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'mutex, T> DerefMut for MutexGuard<'mutex, T> { fn deref_mut<'a>(&'a mut self) -> &'a mut T { unsafe { &mut *self.__data.get() } @@ -341,7 +346,7 @@ impl<'mutex, T> DerefMut for MutexGuard<'mutex, T> { } #[unsafe_destructor] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T> Drop for MutexGuard<'a, T> { #[inline] fn drop(&mut self) { diff --git a/src/libstd/sync/once.rs b/src/libstd/sync/once.rs index 6231a91833d..82ed62966b5 100644 --- a/src/libstd/sync/once.rs +++ b/src/libstd/sync/once.rs @@ -36,7 +36,7 @@ use sync::{StaticMutex, MUTEX_INIT}; /// // run initialization here /// }); /// ``` -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Once { mutex: StaticMutex, cnt: AtomicIsize, @@ -46,7 +46,7 @@ pub struct Once { unsafe impl Sync for Once {} /// Initialization value for static `Once` values. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub const ONCE_INIT: Once = Once { mutex: MUTEX_INIT, cnt: ATOMIC_ISIZE_INIT, @@ -63,7 +63,7 @@ impl Once { /// /// When this function returns, it is guaranteed that some initialization /// has run and completed (it may not be the closure specified). - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn call_once(&'static self, f: F) where F: FnOnce() { // Optimize common path: load is much cheaper than fetch_add. if self.cnt.load(Ordering::SeqCst) < 0 { diff --git a/src/libstd/sync/poison.rs b/src/libstd/sync/poison.rs index e28c3c37b6f..4443fc2be60 100644 --- a/src/libstd/sync/poison.rs +++ b/src/libstd/sync/poison.rs @@ -53,22 +53,22 @@ pub struct Guard { /// is held. The precise semantics for when a lock is poisoned is documented on /// each lock, but once a lock is poisoned then all future acquisitions will /// return this error. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct PoisonError { guard: T, } /// An enumeration of possible errors which can occur while calling the /// `try_lock` method. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub enum TryLockError { /// The lock could not be acquired because another task failed while holding /// the lock. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] Poisoned(PoisonError), /// The lock could not be acquired at this time because the operation would /// otherwise block. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] WouldBlock, } @@ -79,7 +79,7 @@ pub enum TryLockError { /// that the primitive was poisoned. Note that the `Err` variant *also* carries /// the associated guard, and it can be acquired through the `into_inner` /// method. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub type LockResult = Result>; /// A type alias for the result of a nonblocking locking method. @@ -87,7 +87,7 @@ pub type LockResult = Result>; /// For more information, see `LockResult`. A `TryLockResult` doesn't /// necessarily hold the associated guard in the `Err` type as the lock may not /// have been acquired for other reasons. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub type TryLockResult = Result>; impl fmt::Show for PoisonError { @@ -105,22 +105,22 @@ impl Error for PoisonError { impl PoisonError { /// Consumes this error indicating that a lock is poisoned, returning the /// underlying guard to allow access regardless. - #[deprecated="renamed to into_inner"] + #[deprecated(feature = "oldstuff", since = "1.0.0", reason = "renamed to into_inner")] pub fn into_guard(self) -> T { self.guard } /// Consumes this error indicating that a lock is poisoned, returning the /// underlying guard to allow access regardless. - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn into_inner(self) -> T { self.guard } /// Reaches into this error indicating that a lock is poisoned, returning a /// reference to the underlying guard to allow access regardless. - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn get_ref(&self) -> &T { &self.guard } /// Reaches into this error indicating that a lock is poisoned, returning a /// mutable reference to the underlying guard to allow access regardless. - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn get_mut(&mut self) -> &mut T { &mut self.guard } } diff --git a/src/libstd/sync/rwlock.rs b/src/libstd/sync/rwlock.rs index 237f6d08a95..6d0b34b3c87 100644 --- a/src/libstd/sync/rwlock.rs +++ b/src/libstd/sync/rwlock.rs @@ -58,7 +58,7 @@ use sys_common::rwlock as sys; /// assert_eq!(*w, 6); /// } // write lock is dropped here /// ``` -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct RwLock { inner: Box, data: UnsafeCell, @@ -90,7 +90,8 @@ unsafe impl Sync for RwLock {} /// } /// unsafe { LOCK.destroy() } // free all resources /// ``` -#[unstable = "may be merged with RwLock in the future"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "may be merged with RwLock in the future")] pub struct StaticRwLock { lock: sys::RWLock, poison: poison::Flag, @@ -100,7 +101,8 @@ unsafe impl Send for StaticRwLock {} unsafe impl Sync for StaticRwLock {} /// Constant initialization for a statically-initialized rwlock. -#[unstable = "may be merged with RwLock in the future"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "may be merged with RwLock in the future")] pub const RW_LOCK_INIT: StaticRwLock = StaticRwLock { lock: sys::RWLOCK_INIT, poison: poison::FLAG_INIT, @@ -109,7 +111,7 @@ pub const RW_LOCK_INIT: StaticRwLock = StaticRwLock { /// RAII structure used to release the shared read access of a lock when /// dropped. #[must_use] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] #[cfg(stage0)] // NOTE remove impl after next snapshot pub struct RwLockReadGuard<'a, T: 'a> { __lock: &'a StaticRwLock, @@ -120,8 +122,8 @@ pub struct RwLockReadGuard<'a, T: 'a> { /// RAII structure used to release the shared read access of a lock when /// dropped. #[must_use] -#[stable] #[cfg(not(stage0))] // NOTE remove cfg after next snapshot +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct RwLockReadGuard<'a, T: 'a> { __lock: &'a StaticRwLock, __data: &'a UnsafeCell, @@ -133,8 +135,8 @@ impl<'a, T> !marker::Send for RwLockReadGuard<'a, T> {} /// RAII structure used to release the exclusive write access of a lock when /// dropped. #[must_use] -#[stable] #[cfg(stage0)] // NOTE remove impl after next snapshot +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct RwLockWriteGuard<'a, T: 'a> { __lock: &'a StaticRwLock, __data: &'a UnsafeCell, @@ -145,7 +147,7 @@ pub struct RwLockWriteGuard<'a, T: 'a> { /// RAII structure used to release the exclusive write access of a lock when /// dropped. #[must_use] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] #[cfg(not(stage0))] // NOTE remove cfg after next snapshot pub struct RwLockWriteGuard<'a, T: 'a> { __lock: &'a StaticRwLock, @@ -158,7 +160,7 @@ impl<'a, T> !marker::Send for RwLockWriteGuard<'a, T> {} impl RwLock { /// Creates a new instance of an RwLock which is unlocked and read to go. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn new(t: T) -> RwLock { RwLock { inner: box RW_LOCK_INIT, data: UnsafeCell::new(t) } } @@ -181,7 +183,7 @@ impl RwLock { /// is poisoned whenever a writer panics while holding an exclusive lock. /// The failure will occur immediately after the lock has been acquired. #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn read(&self) -> LockResult> { unsafe { self.inner.lock.read() } RwLockReadGuard::new(&*self.inner, &self.data) @@ -203,7 +205,7 @@ impl RwLock { /// error will only be returned if the lock would have otherwise been /// acquired. #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn try_read(&self) -> TryLockResult> { if unsafe { self.inner.lock.try_read() } { Ok(try!(RwLockReadGuard::new(&*self.inner, &self.data))) @@ -227,7 +229,7 @@ impl RwLock { /// is poisoned whenever a writer panics while holding an exclusive lock. /// An error will be returned when the lock is acquired. #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn write(&self) -> LockResult> { unsafe { self.inner.lock.write() } RwLockWriteGuard::new(&*self.inner, &self.data) @@ -246,7 +248,7 @@ impl RwLock { /// error will only be returned if the lock would have otherwise been /// acquired. #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn try_write(&self) -> TryLockResult> { if unsafe { self.inner.lock.try_read() } { Ok(try!(RwLockWriteGuard::new(&*self.inner, &self.data))) @@ -257,7 +259,7 @@ impl RwLock { } #[unsafe_destructor] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl Drop for RwLock { fn drop(&mut self) { unsafe { self.inner.lock.destroy() } @@ -274,7 +276,8 @@ impl StaticRwLock { /// /// See `RwLock::read`. #[inline] - #[unstable = "may be merged with RwLock in the future"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "may be merged with RwLock in the future")] pub fn read(&'static self) -> LockResult> { unsafe { self.lock.read() } RwLockReadGuard::new(self, &DUMMY.0) @@ -284,7 +287,8 @@ impl StaticRwLock { /// /// See `RwLock::try_read`. #[inline] - #[unstable = "may be merged with RwLock in the future"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "may be merged with RwLock in the future")] pub fn try_read(&'static self) -> TryLockResult> { if unsafe { self.lock.try_read() } { @@ -299,7 +303,8 @@ impl StaticRwLock { /// /// See `RwLock::write`. #[inline] - #[unstable = "may be merged with RwLock in the future"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "may be merged with RwLock in the future")] pub fn write(&'static self) -> LockResult> { unsafe { self.lock.write() } RwLockWriteGuard::new(self, &DUMMY.0) @@ -309,7 +314,8 @@ impl StaticRwLock { /// /// See `RwLock::try_write`. #[inline] - #[unstable = "may be merged with RwLock in the future"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "may be merged with RwLock in the future")] pub fn try_write(&'static self) -> TryLockResult> { if unsafe { self.lock.try_write() } { @@ -325,7 +331,8 @@ impl StaticRwLock { /// active users of the lock, and this also doesn't prevent any future users /// of this lock. This method is required to be called to not leak memory on /// all platforms. - #[unstable = "may be merged with RwLock in the future"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "may be merged with RwLock in the future")] pub unsafe fn destroy(&'static self) { self.lock.destroy() } @@ -382,19 +389,19 @@ impl<'rwlock, T> RwLockWriteGuard<'rwlock, T> { } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'rwlock, T> Deref for RwLockReadGuard<'rwlock, T> { type Target = T; fn deref(&self) -> &T { unsafe { &*self.__data.get() } } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'rwlock, T> Deref for RwLockWriteGuard<'rwlock, T> { type Target = T; fn deref(&self) -> &T { unsafe { &*self.__data.get() } } } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'rwlock, T> DerefMut for RwLockWriteGuard<'rwlock, T> { fn deref_mut(&mut self) -> &mut T { unsafe { &mut *self.__data.get() } @@ -402,7 +409,7 @@ impl<'rwlock, T> DerefMut for RwLockWriteGuard<'rwlock, T> { } #[unsafe_destructor] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T> Drop for RwLockReadGuard<'a, T> { fn drop(&mut self) { unsafe { self.__lock.lock.read_unlock(); } @@ -410,7 +417,7 @@ impl<'a, T> Drop for RwLockReadGuard<'a, T> { } #[unsafe_destructor] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T> Drop for RwLockWriteGuard<'a, T> { fn drop(&mut self) { self.__lock.poison.done(&self.__poison); diff --git a/src/libstd/sync/semaphore.rs b/src/libstd/sync/semaphore.rs index 8d44084671a..08b620c764a 100644 --- a/src/libstd/sync/semaphore.rs +++ b/src/libstd/sync/semaphore.rs @@ -8,8 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![unstable = "the interaction between semaphores and the acquisition/release \ - of resources is currently unclear"] +#![unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "the interaction between semaphores and the acquisition/release \ + of resources is currently unclear")] use ops::Drop; use sync::{Mutex, Condvar}; @@ -99,7 +100,7 @@ impl Semaphore { } #[unsafe_destructor] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a> Drop for SemaphoreGuard<'a> { fn drop(&mut self) { self.sem.release(); diff --git a/src/libstd/sync/task_pool.rs b/src/libstd/sync/task_pool.rs index 278528bdb38..ceec1885375 100644 --- a/src/libstd/sync/task_pool.rs +++ b/src/libstd/sync/task_pool.rs @@ -10,10 +10,11 @@ //! Abstraction of a thread pool for basic parallelism. -#![unstable = "the semantics of a failing task and whether a thread is \ - re-attached to a thread pool are somewhat unclear, and the \ - utility of this type in `std::sync` is questionable with \ - respect to the jobs of other primitives"] +#![unstable(feature = "unnamed_feature", since="1.0.0", + reason = "the semantics of a failing task and whether a thread is \ + re-attached to a thread pool are somewhat unclear, and the \ + utility of this type in `std::sync` is questionable with \ + respect to the jobs of other primitives")] use core::prelude::*; diff --git a/src/libstd/sys/unix/ext.rs b/src/libstd/sys/unix/ext.rs index 0e4a9d1b307..4e846a42030 100644 --- a/src/libstd/sys/unix/ext.rs +++ b/src/libstd/sys/unix/ext.rs @@ -29,7 +29,7 @@ //! } //! ``` -#![unstable] +#![unstable(feature = "unnamed_feature", since = "1.0.0")] use sys_common::AsInner; use libc; diff --git a/src/libstd/sys/windows/ext.rs b/src/libstd/sys/windows/ext.rs index 87ff31ab73c..edc46b9c162 100644 --- a/src/libstd/sys/windows/ext.rs +++ b/src/libstd/sys/windows/ext.rs @@ -14,7 +14,7 @@ //! descriptors, and sockets, but its functionality will grow over //! time. -#![unstable] +#![unstable(feature = "unnamed_feature", since = "1.0.0")] use sys_common::AsInner; use libc; diff --git a/src/libstd/thread.rs b/src/libstd/thread.rs index 932556fe1a6..7df7e750610 100644 --- a/src/libstd/thread.rs +++ b/src/libstd/thread.rs @@ -144,7 +144,7 @@ //! //! * It can be implemented highly efficiently on many platforms. -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] use any::Any; use boxed::Box; @@ -166,7 +166,7 @@ use sys_common::{stack, thread_info}; /// Thread configuration. Provides detailed control over the properties /// and behavior of new threads. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Builder { // A name for the thread-to-be, for identification in panic messages name: Option, @@ -181,7 +181,7 @@ pub struct Builder { impl Builder { /// Generate the base configuration for spawning a thread, from which /// configuration methods can be chained. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn new() -> Builder { Builder { name: None, @@ -193,28 +193,30 @@ impl Builder { /// Name the thread-to-be. Currently the name is used for identification /// only in panic messages. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn name(mut self, name: String) -> Builder { self.name = Some(name); self } /// Set the size of the stack for the new thread. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn stack_size(mut self, size: uint) -> Builder { self.stack_size = Some(size); self } /// Redirect thread-local stdout. - #[unstable = "Will likely go away after proc removal"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "Will likely go away after proc removal")] pub fn stdout(mut self, stdout: Box) -> Builder { self.stdout = Some(stdout); self } /// Redirect thread-local stderr. - #[unstable = "Will likely go away after proc removal"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "Will likely go away after proc removal")] pub fn stderr(mut self, stderr: Box) -> Builder { self.stderr = Some(stderr); self @@ -223,7 +225,8 @@ impl Builder { /// Spawn a new detached thread, and return a handle to it. /// /// See `Thead::spawn` and the module doc for more details. - #[unstable = "may change with specifics of new Send semantics"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "may change with specifics of new Send semantics")] pub fn spawn(self, f: F) -> Thread where F: FnOnce(), F: Send + 'static { let (native, thread) = self.spawn_inner(Thunk::new(f), Thunk::with_arg(|_| {})); unsafe { imp::detach(native) }; @@ -234,7 +237,8 @@ impl Builder { /// scope, and return a `JoinGuard`. /// /// See `Thead::scoped` and the module doc for more details. - #[unstable = "may change with specifics of new Send semantics"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "may change with specifics of new Send semantics")] pub fn scoped<'a, T, F>(self, f: F) -> JoinGuard<'a, T> where T: Send + 'a, F: FnOnce() -> T, F: Send + 'a { @@ -326,7 +330,7 @@ struct Inner { unsafe impl Sync for Inner {} #[derive(Clone)] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] /// A handle to a thread. pub struct Thread { inner: Arc, @@ -350,7 +354,8 @@ impl Thread { /// main thread; the whole process is terminated when the main thread /// finishes.) The thread handle can be used for low-level /// synchronization. See the module documentation for additional details. - #[unstable = "may change with specifics of new Send semantics"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "may change with specifics of new Send semantics")] pub fn spawn(f: F) -> Thread where F: FnOnce(), F: Send + 'static { Builder::new().spawn(f) } @@ -363,7 +368,8 @@ impl Thread { /// current thread's stack (hence the "scoped" name), it cannot be detached; /// it *must* be joined before the relevant stack frame is popped. See the /// module documentation for additional details. - #[unstable = "may change with specifics of new Send semantics"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "may change with specifics of new Send semantics")] pub fn scoped<'a, T, F>(f: F) -> JoinGuard<'a, T> where T: Send + 'a, F: FnOnce() -> T, F: Send + 'a { @@ -371,20 +377,20 @@ impl Thread { } /// Gets a handle to the thread that invokes it. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn current() -> Thread { thread_info::current_thread() } /// Cooperatively give up a timeslice to the OS scheduler. - #[unstable = "name may change"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "name may change")] pub fn yield_now() { unsafe { imp::yield_now() } } /// Determines whether the current thread is panicking. #[inline] - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn panicking() -> bool { unwind::panicking() } @@ -398,7 +404,7 @@ impl Thread { // future, this will be implemented in a more efficient way, perhaps along the lines of // http://cr.openjdk.java.net/~stefank/6989984.1/raw_files/new/src/os/linux/vm/os_linux.cpp // or futuxes, and in either case may allow spurious wakeups. - #[unstable = "recently introduced"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "recently introduced")] pub fn park() { let thread = Thread::current(); let mut guard = thread.inner.lock.lock().unwrap(); @@ -411,7 +417,7 @@ impl Thread { /// Atomically makes the handle's token available if it is not already. /// /// See the module doc for more detail. - #[unstable = "recently introduced"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "recently introduced")] pub fn unpark(&self) { let mut guard = self.inner.lock.lock().unwrap(); if !*guard { @@ -421,7 +427,7 @@ impl Thread { } /// Get the thread's name. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn name(&self) -> Option<&str> { self.inner.name.as_ref().map(|s| s.as_slice()) } @@ -435,7 +441,7 @@ impl thread_info::NewThread for Thread { /// Indicates the manner in which a thread exited. /// /// A thread that completes without panicking is considered to exit successfully. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub type Result = ::result::Result>; struct Packet(Arc>>>); @@ -447,7 +453,8 @@ unsafe impl Sync for Packet {} /// /// The type `T` is the return type for the thread's main function. #[must_use] -#[unstable = "may change with specifics of new Send semantics"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "may change with specifics of new Send semantics")] pub struct JoinGuard<'a, T: 'a> { native: imp::rust_thread, thread: Thread, @@ -455,12 +462,12 @@ pub struct JoinGuard<'a, T: 'a> { packet: Packet, } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] unsafe impl<'a, T: Send + 'a> Sync for JoinGuard<'a, T> {} impl<'a, T: Send + 'a> JoinGuard<'a, T> { /// Extract a handle to the thread this guard will join on. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn thread(&self) -> &Thread { &self.thread } @@ -470,7 +477,7 @@ impl<'a, T: Send + 'a> JoinGuard<'a, T> { /// /// If the child thread panics, `Err` is returned with the parameter given /// to `panic`. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn join(mut self) -> Result { assert!(!self.joined); unsafe { imp::join(self.native) }; @@ -483,7 +490,8 @@ impl<'a, T: Send + 'a> JoinGuard<'a, T> { impl JoinGuard<'static, T> { /// Detaches the child thread, allowing it to outlive its parent. - #[unstable = "unsure whether this API imposes limitations elsewhere"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "unsure whether this API imposes limitations elsewhere")] pub fn detach(mut self) { unsafe { imp::detach(self.native) }; self.joined = true; // avoid joining in the destructor @@ -491,7 +499,7 @@ impl JoinGuard<'static, T> { } #[unsafe_destructor] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl<'a, T: Send + 'a> Drop for JoinGuard<'a, T> { fn drop(&mut self) { if !self.joined { diff --git a/src/libstd/thread_local/mod.rs b/src/libstd/thread_local/mod.rs index 4c99cff34da..bf74acda721 100644 --- a/src/libstd/thread_local/mod.rs +++ b/src/libstd/thread_local/mod.rs @@ -34,7 +34,7 @@ //! will want to make use of some form of **interior mutability** through the //! `Cell` or `RefCell` types. -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] use prelude::v1::*; @@ -93,7 +93,7 @@ pub mod __impl { /// assert_eq!(*f.borrow(), 2); /// }); /// ``` -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Key { // The key itself may be tagged with #[thread_local], and this `Key` is // stored as a `static`, and it's not valid for a static to reference the @@ -113,7 +113,7 @@ pub struct Key { /// Declare a new thread local storage key of type `std::thread_local::Key`. #[macro_export] -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] macro_rules! thread_local { (static $name:ident: $t:ty = $init:expr) => ( static $name: ::std::thread_local::Key<$t> = { @@ -218,7 +218,8 @@ macro_rules! __thread_local_inner { } /// Indicator of the state of a thread local storage key. -#[unstable = "state querying was recently added"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "state querying was recently added")] #[derive(Eq, PartialEq, Copy)] pub enum State { /// All keys are in this state whenever a thread starts. Keys will @@ -258,7 +259,7 @@ impl Key { /// This function will `panic!()` if the key currently has its /// destructor running, and it **may** panic if the destructor has /// previously been run for this thread. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn with(&'static self, f: F) -> R where F: FnOnce(&T) -> R { let slot = (self.inner)(); @@ -301,7 +302,8 @@ impl Key { /// initialization does not panic. Keys in the `Valid` state are guaranteed /// to be able to be accessed. Keys in the `Destroyed` state will panic on /// any call to `with`. - #[unstable = "state querying was recently added"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "state querying was recently added")] pub fn state(&'static self) -> State { unsafe { match (self.inner)().get() { @@ -317,7 +319,8 @@ impl Key { } /// Deprecated - #[deprecated = "function renamed to state() and returns more info"] + #[deprecated(feature = "oldstuff", since = "1.0.0", + reason = "function renamed to state() and returns more info")] pub fn destroyed(&'static self) -> bool { self.state() == State::Destroyed } } diff --git a/src/libstd/thread_local/scoped.rs b/src/libstd/thread_local/scoped.rs index 1fb5652bc0c..e7062b298d2 100644 --- a/src/libstd/thread_local/scoped.rs +++ b/src/libstd/thread_local/scoped.rs @@ -38,8 +38,9 @@ //! }); //! ``` -#![unstable = "scoped TLS has yet to have wide enough use to fully consider \ - stabilizing its interface"] +#![unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "scoped TLS has yet to have wide enough use to fully consider \ + stabilizing its interface")] use prelude::v1::*; diff --git a/src/libstd/time/duration.rs b/src/libstd/time/duration.rs index 162c3677168..90fd3b0138f 100644 --- a/src/libstd/time/duration.rs +++ b/src/libstd/time/duration.rs @@ -10,7 +10,7 @@ //! Temporal quantification -#![unstable] +#![unstable(feature = "unnamed_feature", since = "1.0.0")] use {fmt, i64}; use ops::{Add, Sub, Mul, Div, Neg, FnOnce}; diff --git a/src/libstd/tuple.rs b/src/libstd/tuple.rs index e76dcef226d..b06deb738fc 100644 --- a/src/libstd/tuple.rs +++ b/src/libstd/tuple.rs @@ -57,4 +57,4 @@ //! ``` #![doc(primitive = "tuple")] -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] diff --git a/src/libstd/unit.rs b/src/libstd/unit.rs index 012b175b031..0893fe8ea06 100644 --- a/src/libstd/unit.rs +++ b/src/libstd/unit.rs @@ -9,7 +9,7 @@ // except according to those terms. #![doc(primitive = "unit")] -#![stable] +#![stable(feature = "grandfathered", since = "1.0.0")] //! The `()` type, sometimes called "unit" or "nil". //! diff --git a/src/libsyntax/attr.rs b/src/libsyntax/attr.rs index 74d7ddc21c3..9aa226103f3 100644 --- a/src/libsyntax/attr.rs +++ b/src/libsyntax/attr.rs @@ -21,7 +21,7 @@ use codemap::{Span, Spanned, spanned, dummy_spanned}; use codemap::BytePos; use diagnostic::SpanHandler; use parse::lexer::comments::{doc_comment_style, strip_doc_comment_decoration}; -use parse::token::InternedString; +use parse::token::{InternedString, intern_and_get_ident}; use parse::token; use ptr::P; @@ -56,6 +56,8 @@ pub trait AttrMetaMethods { fn value_str(&self) -> Option; /// Gets a list of inner meta items from a list MetaItem type. fn meta_item_list<'a>(&'a self) -> Option<&'a [P]>; + + fn span(&self) -> Span; } impl AttrMetaMethods for Attribute { @@ -73,6 +75,7 @@ impl AttrMetaMethods for Attribute { fn meta_item_list<'a>(&'a self) -> Option<&'a [P]> { self.node.value.meta_item_list() } + fn span(&self) -> Span { self.meta().span } } impl AttrMetaMethods for MetaItem { @@ -102,6 +105,7 @@ impl AttrMetaMethods for MetaItem { _ => None } } + fn span(&self) -> Span { self.span } } // Annoying, but required to get test_cfg to work @@ -111,6 +115,7 @@ impl AttrMetaMethods for P { fn meta_item_list<'a>(&'a self) -> Option<&'a [P]> { (**self).meta_item_list() } + fn span(&self) -> Span { (**self).span() } } @@ -340,11 +345,13 @@ pub fn cfg_matches(diagnostic: &SpanHandler, cfgs: &[P], cfg: &ast::Me } } -/// Represents the #[deprecated="foo"] and friends attributes. +/// Represents the #[deprecated] and friends attributes. #[derive(RustcEncodable,RustcDecodable,Clone,Show)] pub struct Stability { pub level: StabilityLevel, - pub text: Option + pub feature: InternedString, + pub since: InternedString, + pub reason: Option, } /// The available stability levels. @@ -364,7 +371,7 @@ impl fmt::String for StabilityLevel { pub fn find_stability_generic<'a, AM: AttrMetaMethods, I: Iterator> - (mut attrs: I) + (diagnostic: &SpanHandler, mut attrs: I) -> Option<(Stability, &'a AM)> { for attr in attrs { let level = match attr.name().get() { @@ -374,17 +381,66 @@ pub fn find_stability_generic<'a, _ => continue // not a stability level }; + let (feature, since, reason) = match attr.meta_item_list() { + Some(metas) => { + let mut feature = None; + let mut since = None; + let mut reason = None; + for meta in metas.iter() { + if meta.name().get() == "feature" { + match meta.value_str() { + Some(v) => feature = Some(v), + None => { + diagnostic.span_err(meta.span, "incorrect meta item"); + } + } + } + if meta.name().get() == "since" { + match meta.value_str() { + Some(v) => since = Some(v), + None => { + diagnostic.span_err(meta.span, "incorrect meta item"); + } + } + } + if meta.name().get() == "reason" { + match meta.value_str() { + Some(v) => reason = Some(v), + None => { + diagnostic.span_err(meta.span, "incorrect meta item"); + } + } + } + } + (feature, since, reason) + } + None => { + diagnostic.span_err(attr.span(), "incorrect stability attribute type"); + (None, None, None) + } + }; + + if feature == None { + diagnostic.span_err(attr.span(), "missing 'feature'"); + } + + if since == None { + diagnostic.span_err(attr.span(), "missing 'since'"); + } + return Some((Stability { level: level, - text: attr.value_str() - }, attr)); + feature: feature.unwrap_or(intern_and_get_ident("bogus")), + since: since.unwrap_or(intern_and_get_ident("bogus")), + reason: reason, + }, attr)); } None } /// Find the first stability attribute. `None` if none exists. -pub fn find_stability(attrs: &[Attribute]) -> Option { - find_stability_generic(attrs.iter()).map(|(s, attr)| { +pub fn find_stability(diagnostic: &SpanHandler, attrs: &[Attribute]) -> Option { + find_stability_generic(diagnostic, attrs.iter()).map(|(s, attr)| { mark_used(attr); s }) diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs index f2498abfa6a..cd04332b47f 100644 --- a/src/libsyntax/ext/base.rs +++ b/src/libsyntax/ext/base.rs @@ -568,7 +568,8 @@ impl<'a> ExtCtxt<'a> { } } - #[deprecated = "Replaced with `expander().fold_expr()`"] + #[deprecated(feature = "oldstuff", since = "1.0.0", + reason = "Replaced with `expander().fold_expr()`")] pub fn expand_expr(&mut self, e: P) -> P { self.expander().fold_expr(e) } diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs index fa675a9fcaa..d8a0c51b5ab 100644 --- a/src/libsyntax/lib.rs +++ b/src/libsyntax/lib.rs @@ -15,7 +15,7 @@ //! This API is completely unstable and subject to change. #![crate_name = "syntax"] -#![unstable] +#![unstable(feature = "unnamed_feature", since = "1.0.0")] #![staged_api] #![crate_type = "dylib"] #![crate_type = "rlib"] diff --git a/src/libsyntax/util/small_vector.rs b/src/libsyntax/util/small_vector.rs index b68c9926391..342fed1653d 100644 --- a/src/libsyntax/util/small_vector.rs +++ b/src/libsyntax/util/small_vector.rs @@ -112,7 +112,7 @@ impl SmallVector { } /// Deprecated: use `into_iter`. - #[deprecated = "use into_iter"] + #[deprecated(feature = "oldstuff", since = "1.0.0", reason = "use into_iter")] pub fn move_iter(self) -> IntoIter { self.into_iter() } diff --git a/src/libterm/lib.rs b/src/libterm/lib.rs index 027c5a1a708..a6ec16445c2 100644 --- a/src/libterm/lib.rs +++ b/src/libterm/lib.rs @@ -39,7 +39,8 @@ //! [ti]: https://en.wikipedia.org/wiki/Terminfo #![crate_name = "term"] -#![unstable = "use the crates.io `term` library instead"] +#![unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "use the crates.io `term` library instead")] #![staged_api] #![crate_type = "rlib"] #![crate_type = "dylib"] diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs index f9fb767f77e..be7410d901a 100644 --- a/src/libtest/lib.rs +++ b/src/libtest/lib.rs @@ -24,7 +24,7 @@ // build off of. #![crate_name = "test"] -#![unstable] +#![unstable(feature = "unnamed_feature", since = "1.0.0")] #![staged_api] #![crate_type = "rlib"] #![crate_type = "dylib"] diff --git a/src/libunicode/lib.rs b/src/libunicode/lib.rs index fbe912ced90..6fc6f614308 100644 --- a/src/libunicode/lib.rs +++ b/src/libunicode/lib.rs @@ -21,7 +21,7 @@ //! (yet) aim to provide a full set of Unicode tables. #![crate_name = "unicode"] -#![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", @@ -59,7 +59,7 @@ mod u_str; /// (inclusive) are allowed. A `char` can always be safely cast to a `u32`; /// however the converse is not always true due to the above range limits /// and, as such, should be performed via the `from_u32` function.. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub mod char { pub use core::char::{MAX, from_u32, from_digit}; diff --git a/src/libunicode/u_char.rs b/src/libunicode/u_char.rs index 4142a62ba66..64515ddf22f 100644 --- a/src/libunicode/u_char.rs +++ b/src/libunicode/u_char.rs @@ -19,7 +19,7 @@ use core::option::Option; use tables::{derived_property, property, general_category, conversions, charwidth}; /// Functionality for manipulating `char`. -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub trait CharExt { /// Checks if a `char` parses as a numeric digit in the given radix. /// @@ -34,7 +34,8 @@ pub trait CharExt { /// # Panics /// /// Panics if given a radix > 36. - #[unstable = "pending integer conventions"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "pending integer conventions")] fn is_digit(self, radix: uint) -> bool; /// Converts a character to the corresponding digit. @@ -48,7 +49,8 @@ pub trait CharExt { /// # Panics /// /// Panics if given a radix outside the range [0..36]. - #[unstable = "pending integer conventions"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "pending integer conventions")] fn to_digit(self, radix: uint) -> Option; /// Returns an iterator that yields the hexadecimal Unicode escape @@ -57,7 +59,7 @@ pub trait CharExt { /// All characters are escaped with Rust syntax of the form `\\u{NNNN}` /// where `NNNN` is the shortest hexadecimal representation of the code /// point. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn escape_unicode(self) -> char::EscapeUnicode; /// Returns an iterator that yields the 'default' ASCII and @@ -72,17 +74,17 @@ pub trait CharExt { /// escaped. /// * Any other chars in the range [0x20,0x7e] are not escaped. /// * Any other chars are given hex Unicode escapes; see `escape_unicode`. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn escape_default(self) -> char::EscapeDefault; /// Returns the amount of bytes this character would need if encoded in /// UTF-8. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn len_utf8(self) -> uint; /// Returns the amount of bytes this character would need if encoded in /// UTF-16. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn len_utf16(self) -> uint; /// Encodes this character as UTF-8 into the provided byte buffer, @@ -90,7 +92,8 @@ pub trait CharExt { /// /// If the buffer is not large enough, nothing will be written into it /// and a `None` will be returned. - #[unstable = "pending decision about Iterator/Writer/Reader"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "pending decision about Iterator/Writer/Reader")] fn encode_utf8(self, dst: &mut [u8]) -> Option; /// Encodes this character as UTF-16 into the provided `u16` buffer, @@ -98,12 +101,13 @@ pub trait CharExt { /// /// If the buffer is not large enough, nothing will be written into it /// and a `None` will be returned. - #[unstable = "pending decision about Iterator/Writer/Reader"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "pending decision about Iterator/Writer/Reader")] fn encode_utf16(self, dst: &mut [u16]) -> Option; /// Returns whether the specified character is considered a Unicode /// alphabetic code point. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn is_alphabetic(self) -> bool; /// Returns whether the specified character satisfies the 'XID_Start' @@ -112,7 +116,8 @@ pub trait CharExt { /// 'XID_Start' is a Unicode Derived Property specified in /// [UAX #31](http://unicode.org/reports/tr31/#NFKC_Modifications), /// mostly similar to ID_Start but modified for closure under NFKx. - #[unstable = "mainly needed for compiler internals"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "mainly needed for compiler internals")] fn is_xid_start(self) -> bool; /// Returns whether the specified `char` satisfies the 'XID_Continue' @@ -121,45 +126,46 @@ pub trait CharExt { /// 'XID_Continue' is a Unicode Derived Property specified in /// [UAX #31](http://unicode.org/reports/tr31/#NFKC_Modifications), /// mostly similar to 'ID_Continue' but modified for closure under NFKx. - #[unstable = "mainly needed for compiler internals"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "mainly needed for compiler internals")] fn is_xid_continue(self) -> bool; /// Indicates whether a character is in lowercase. /// /// This is defined according to the terms of the Unicode Derived Core /// Property `Lowercase`. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn is_lowercase(self) -> bool; /// Indicates whether a character is in uppercase. /// /// This is defined according to the terms of the Unicode Derived Core /// Property `Uppercase`. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn is_uppercase(self) -> bool; /// Indicates whether a character is whitespace. /// /// Whitespace is defined in terms of the Unicode Property `White_Space`. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn is_whitespace(self) -> bool; /// Indicates whether a character is alphanumeric. /// /// Alphanumericness is defined in terms of the Unicode General Categories /// 'Nd', 'Nl', 'No' and the Derived Core Property 'Alphabetic'. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn is_alphanumeric(self) -> bool; /// Indicates whether a character is a control code point. /// /// Control code points are defined in terms of the Unicode General /// Category `Cc`. - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn is_control(self) -> bool; /// Indicates whether the character is numeric (Nd, Nl, or No). - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn is_numeric(self) -> bool; /// Converts a character to its lowercase equivalent. @@ -171,7 +177,8 @@ pub trait CharExt { /// /// Returns the lowercase equivalent of the character, or the character /// itself if no conversion is possible. - #[unstable = "pending case transformation decisions"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "pending case transformation decisions")] fn to_lowercase(self) -> char; /// Converts a character to its uppercase equivalent. @@ -194,7 +201,8 @@ pub trait CharExt { /// [`SpecialCasing`.txt`]: ftp://ftp.unicode.org/Public/UNIDATA/SpecialCasing.txt /// /// [2]: http://www.unicode.org/versions/Unicode4.0.0/ch03.pdf#G33992 - #[unstable = "pending case transformation decisions"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "pending case transformation decisions")] fn to_uppercase(self) -> char; /// Returns this character's displayed width in columns, or `None` if it is a @@ -206,30 +214,35 @@ pub trait CharExt { /// [Unicode Standard Annex #11](http://www.unicode.org/reports/tr11/) /// recommends that these characters be treated as 1 column (i.e., /// `is_cjk` = `false`) if the context cannot be reliably determined. - #[unstable = "needs expert opinion. is_cjk flag stands out as ugly"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "needs expert opinion. is_cjk flag stands out as ugly")] fn width(self, is_cjk: bool) -> Option; } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] impl CharExt for char { - #[unstable = "pending integer conventions"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "pending integer conventions")] fn is_digit(self, radix: uint) -> bool { C::is_digit(self, radix) } - #[unstable = "pending integer conventions"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "pending integer conventions")] fn to_digit(self, radix: uint) -> Option { C::to_digit(self, radix) } - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn escape_unicode(self) -> char::EscapeUnicode { C::escape_unicode(self) } - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn escape_default(self) -> char::EscapeDefault { C::escape_default(self) } - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn len_utf8(self) -> uint { C::len_utf8(self) } - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn len_utf16(self) -> uint { C::len_utf16(self) } - #[unstable = "pending decision about Iterator/Writer/Reader"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "pending decision about Iterator/Writer/Reader")] fn encode_utf8(self, dst: &mut [u8]) -> Option { C::encode_utf8(self, dst) } - #[unstable = "pending decision about Iterator/Writer/Reader"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "pending decision about Iterator/Writer/Reader")] fn encode_utf16(self, dst: &mut [u16]) -> Option { C::encode_utf16(self, dst) } - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn is_alphabetic(self) -> bool { match self { 'a' ... 'z' | 'A' ... 'Z' => true, @@ -238,13 +251,15 @@ impl CharExt for char { } } - #[unstable = "mainly needed for compiler internals"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "mainly needed for compiler internals")] fn is_xid_start(self) -> bool { derived_property::XID_Start(self) } - #[unstable = "mainly needed for compiler internals"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "mainly needed for compiler internals")] fn is_xid_continue(self) -> bool { derived_property::XID_Continue(self) } - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn is_lowercase(self) -> bool { match self { 'a' ... 'z' => true, @@ -253,7 +268,7 @@ impl CharExt for char { } } - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn is_uppercase(self) -> bool { match self { 'A' ... 'Z' => true, @@ -262,7 +277,7 @@ impl CharExt for char { } } - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn is_whitespace(self) -> bool { match self { ' ' | '\x09' ... '\x0d' => true, @@ -271,15 +286,15 @@ impl CharExt for char { } } - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn is_alphanumeric(self) -> bool { self.is_alphabetic() || self.is_numeric() } - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn is_control(self) -> bool { general_category::Cc(self) } - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn is_numeric(self) -> bool { match self { '0' ... '9' => true, @@ -288,12 +303,15 @@ impl CharExt for char { } } - #[unstable = "pending case transformation decisions"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "pending case transformation decisions")] fn to_lowercase(self) -> char { conversions::to_lower(self) } - #[unstable = "pending case transformation decisions"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "pending case transformation decisions")] fn to_uppercase(self) -> char { conversions::to_upper(self) } - #[unstable = "needs expert opinion. is_cjk flag stands out as ugly"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", + reason = "needs expert opinion. is_cjk flag stands out as ugly")] fn width(self, is_cjk: bool) -> Option { charwidth::width(self, is_cjk) } } diff --git a/src/libunicode/u_str.rs b/src/libunicode/u_str.rs index 13672a7b480..0ee8c028fa7 100644 --- a/src/libunicode/u_str.rs +++ b/src/libunicode/u_str.rs @@ -30,7 +30,7 @@ use u_char::CharExt as UCharExt; // conflicts with core::prelude::CharExt use tables::grapheme::GraphemeCat; /// An iterator over the words of a string, separated by a sequence of whitespace -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct Words<'a> { inner: Filter<&'a str, Split<'a, fn(char) -> bool>, fn(&&str) -> bool>, } diff --git a/src/test/auxiliary/inherited_stability.rs b/src/test/auxiliary/inherited_stability.rs index 7a01ce3de0b..ada75c0e149 100644 --- a/src/test/auxiliary/inherited_stability.rs +++ b/src/test/auxiliary/inherited_stability.rs @@ -9,52 +9,45 @@ // except according to those terms. #![crate_name="inherited_stability"] #![crate_type = "lib"] -#![unstable] +#![unstable(feature = "unnamed_feature", since = "1.0.0")] #![staged_api] -pub fn experimental() {} +pub fn unstable() {} -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub fn stable() {} -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub mod stable_mod { - pub fn experimental() {} + pub fn unstable() {} - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn stable() {} } -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] pub mod unstable_mod { - #[unstable] - pub fn experimental() {} + #[deprecated(feature = "unnamed_feature", since = "1.0.0")] + pub fn deprecated() {} pub fn unstable() {} } -pub mod experimental_mod { - pub fn experimental() {} - - #[stable] - pub fn stable() {} -} - -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub trait Stable { - fn experimental(&self); + fn unstable(&self); - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn stable(&self); } impl Stable for uint { - fn experimental(&self) {} + fn unstable(&self) {} fn stable(&self) {} } -pub enum Experimental { - ExperimentalVariant, - #[stable] +pub enum Unstable { + UnstableVariant, + #[stable(feature = "grandfathered", since = "1.0.0")] StableVariant } diff --git a/src/test/auxiliary/lint_output_format.rs b/src/test/auxiliary/lint_output_format.rs index adbb90fe6c8..3af319197e3 100755 --- a/src/test/auxiliary/lint_output_format.rs +++ b/src/test/auxiliary/lint_output_format.rs @@ -12,17 +12,17 @@ #![crate_type = "lib"] #![staged_api] -#[deprecated] +#[deprecated(feature = "oldstuff", since = "1.0.0")] pub fn foo() -> uint { 20 } -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn bar() -> uint { 40 } -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn baz() -> uint { 30 } diff --git a/src/test/auxiliary/lint_stability.rs b/src/test/auxiliary/lint_stability.rs index 73724713b21..31746c062b5 100644 --- a/src/test/auxiliary/lint_stability.rs +++ b/src/test/auxiliary/lint_stability.rs @@ -11,62 +11,42 @@ #![crate_type = "lib"] #![staged_api] -#[deprecated] +#[deprecated(feature = "oldstuff", since = "1.0.0")] pub fn deprecated() {} -#[deprecated="text"] +#[deprecated(feature = "oldstuff", since = "1.0.0", reason = "text")] pub fn deprecated_text() {} -#[unstable] -pub fn experimental() {} -#[unstable="text"] -pub fn experimental_text() {} - -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn unstable() {} -#[unstable="text"] +#[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "text")] pub fn unstable_text() {} pub fn unmarked() {} -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub fn stable() {} -#[stable="text"] +#[stable(feature = "grandfathered", since = "1.0.0", reason = "text")] pub fn stable_text() {} -#[locked] -pub fn locked() {} -#[locked="text"] -pub fn locked_text() {} - -#[frozen] -pub fn frozen() {} -#[frozen="text"] -pub fn frozen_text() {} - -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct MethodTester; impl MethodTester { - #[deprecated] + #[deprecated(feature = "oldstuff", since = "1.0.0")] pub fn method_deprecated(&self) {} - #[deprecated="text"] + #[deprecated(feature = "oldstuff", since = "1.0.0", reason = "text")] pub fn method_deprecated_text(&self) {} - #[unstable] - pub fn method_experimental(&self) {} - #[unstable="text"] - pub fn method_experimental_text(&self) {} - - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn method_unstable(&self) {} - #[unstable="text"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "text")] pub fn method_unstable_text(&self) {} pub fn method_unmarked(&self) {} - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn method_stable(&self) {} - #[stable="text"] + #[stable(feature = "grandfathered", since = "1.0.0", reason = "text")] pub fn method_stable_text(&self) {} #[locked] @@ -81,26 +61,21 @@ impl MethodTester { } pub trait Trait { - #[deprecated] + #[deprecated(feature = "oldstuff", since = "1.0.0")] fn trait_deprecated(&self) {} - #[deprecated="text"] + #[deprecated(feature = "oldstuff", since = "1.0.0", reason = "text")] fn trait_deprecated_text(&self) {} - #[unstable] - fn trait_experimental(&self) {} - #[unstable="text"] - fn trait_experimental_text(&self) {} - - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] fn trait_unstable(&self) {} - #[unstable="text"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "text")] fn trait_unstable_text(&self) {} fn trait_unmarked(&self) {} - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn trait_stable(&self) {} - #[stable="text"] + #[stable(feature = "grandfathered", since = "1.0.0", reason = "text")] fn trait_stable_text(&self) {} #[locked] @@ -116,67 +91,43 @@ pub trait Trait { impl Trait for MethodTester {} -#[unstable] -pub trait ExperimentalTrait {} +#[unstable(feature = "unnamed_feature", since = "1.0.0")] +pub trait UnstableTrait {} -#[deprecated] +#[deprecated(feature = "oldstuff", since = "1.0.0")] pub struct DeprecatedStruct { pub i: int } -#[unstable] -pub struct ExperimentalStruct { pub i: int } -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] pub struct UnstableStruct { pub i: int } pub struct UnmarkedStruct { pub i: int } -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct StableStruct { pub i: int } -#[frozen] -pub struct FrozenStruct { pub i: int } -#[locked] -pub struct LockedStruct { pub i: int } -#[deprecated] +#[deprecated(feature = "oldstuff", since = "1.0.0")] pub struct DeprecatedUnitStruct; -#[unstable] -pub struct ExperimentalUnitStruct; -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] pub struct UnstableUnitStruct; pub struct UnmarkedUnitStruct; -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct StableUnitStruct; -#[frozen] -pub struct FrozenUnitStruct; -#[locked] -pub struct LockedUnitStruct; pub enum Enum { - #[deprecated] + #[deprecated(feature = "oldstuff", since = "1.0.0")] DeprecatedVariant, - #[unstable] - ExperimentalVariant, - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] UnstableVariant, UnmarkedVariant, - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] StableVariant, - #[frozen] - FrozenVariant, - #[locked] - LockedVariant, } -#[deprecated] +#[deprecated(feature = "oldstuff", since = "1.0.0")] pub struct DeprecatedTupleStruct(pub int); -#[unstable] -pub struct ExperimentalTupleStruct(pub int); -#[unstable] +#[unstable(feature = "unnamed_feature", since = "1.0.0")] pub struct UnstableTupleStruct(pub int); pub struct UnmarkedTupleStruct(pub int); -#[stable] +#[stable(feature = "grandfathered", since = "1.0.0")] pub struct StableTupleStruct(pub int); -#[frozen] -pub struct FrozenTupleStruct(pub int); -#[locked] -pub struct LockedTupleStruct(pub int); #[macro_export] macro_rules! macro_test { diff --git a/src/test/auxiliary/stability_cfg1.rs b/src/test/auxiliary/stability_cfg1.rs index de806c65beb..68503f15bd8 100644 --- a/src/test/auxiliary/stability_cfg1.rs +++ b/src/test/auxiliary/stability_cfg1.rs @@ -9,5 +9,5 @@ // except according to those terms. #![cfg_attr(foo, experimental)] -#![cfg_attr(not(foo), stable)] +#![cfg_attr(not(foo), stable(feature = "unnamed_feature", since = "1.0.0"))] #![staged_api] diff --git a/src/test/auxiliary/stability_cfg2.rs b/src/test/auxiliary/stability_cfg2.rs index 842f35b08ae..19fa7a4f988 100644 --- a/src/test/auxiliary/stability_cfg2.rs +++ b/src/test/auxiliary/stability_cfg2.rs @@ -10,6 +10,6 @@ // compile-flags:--cfg foo -#![cfg_attr(foo, unstable)] -#![cfg_attr(not(foo), stable)] +#![cfg_attr(foo, unstable(feature = "unnamed_feature", since = "1.0.0"))] +#![cfg_attr(not(foo), stable(feature = "unnamed_feature", since = "1.0.0"))] #![staged_api] diff --git a/src/test/compile-fail/issue-17337.rs b/src/test/compile-fail/issue-17337.rs index 24425e5eeec..200888ff2f8 100644 --- a/src/test/compile-fail/issue-17337.rs +++ b/src/test/compile-fail/issue-17337.rs @@ -14,7 +14,7 @@ struct Foo; impl Foo { - #[deprecated] + #[deprecated(feature = "oldstuff", since = "1.0.0")] fn foo(self) {} } diff --git a/src/test/compile-fail/issue-20711-2.rs b/src/test/compile-fail/issue-20711-2.rs index f5f5c4fe8d7..89509ac9a9b 100644 --- a/src/test/compile-fail/issue-20711-2.rs +++ b/src/test/compile-fail/issue-20711-2.rs @@ -13,7 +13,7 @@ struct Foo; impl Foo { fn foo() {} - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] } //~ ERROR expected `fn`, found `}` fn main() {} diff --git a/src/test/compile-fail/issue-20711.rs b/src/test/compile-fail/issue-20711.rs index b065355394c..409d3568456 100644 --- a/src/test/compile-fail/issue-20711.rs +++ b/src/test/compile-fail/issue-20711.rs @@ -11,7 +11,7 @@ struct Foo; impl Foo { - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] } //~ ERROR expected `fn`, found `}` fn main() {} diff --git a/src/test/compile-fail/lint-stability.rs b/src/test/compile-fail/lint-stability.rs index eab5e98d68f..316c971e016 100644 --- a/src/test/compile-fail/lint-stability.rs +++ b/src/test/compile-fail/lint-stability.rs @@ -39,14 +39,6 @@ mod cross_crate { foo.method_deprecated_text(); //~ ERROR use of deprecated item: text foo.trait_deprecated_text(); //~ ERROR use of deprecated item: text - experimental(); //~ ERROR use of unstable item - foo.method_experimental(); //~ ERROR use of unstable item - foo.trait_experimental(); //~ ERROR use of unstable item - - experimental_text(); //~ ERROR use of unstable item: text - foo.method_experimental_text(); //~ ERROR use of unstable item: text - foo.trait_experimental_text(); //~ ERROR use of unstable item: text - unstable(); //~ ERROR use of unstable item foo.method_unstable(); //~ ERROR use of unstable item foo.trait_unstable(); //~ ERROR use of unstable item @@ -67,53 +59,25 @@ mod cross_crate { foo.method_stable_text(); foo.trait_stable_text(); - frozen(); - foo.method_frozen(); - foo.trait_frozen(); - - frozen_text(); - foo.method_frozen_text(); - foo.trait_frozen_text(); - - locked(); - foo.method_locked(); - foo.trait_locked(); - - locked_text(); - foo.method_locked_text(); - foo.trait_locked_text(); - let _ = DeprecatedStruct { i: 0 }; //~ ERROR use of deprecated item - let _ = ExperimentalStruct { i: 0 }; //~ ERROR use of unstable item let _ = UnstableStruct { i: 0 }; //~ ERROR use of unstable item let _ = UnmarkedStruct { i: 0 }; //~ ERROR use of unmarked item let _ = StableStruct { i: 0 }; - let _ = FrozenStruct { i: 0 }; - let _ = LockedStruct { i: 0 }; let _ = DeprecatedUnitStruct; //~ ERROR use of deprecated item - let _ = ExperimentalUnitStruct; //~ ERROR use of unstable item let _ = UnstableUnitStruct; //~ ERROR use of unstable item let _ = UnmarkedUnitStruct; //~ ERROR use of unmarked item let _ = StableUnitStruct; - let _ = FrozenUnitStruct; - let _ = LockedUnitStruct; let _ = Enum::DeprecatedVariant; //~ ERROR use of deprecated item - let _ = Enum::ExperimentalVariant; //~ ERROR use of unstable item let _ = Enum::UnstableVariant; //~ ERROR use of unstable item let _ = Enum::UnmarkedVariant; //~ ERROR use of unmarked item let _ = Enum::StableVariant; - let _ = Enum::FrozenVariant; - let _ = Enum::LockedVariant; let _ = DeprecatedTupleStruct (1); //~ ERROR use of deprecated item - let _ = ExperimentalTupleStruct (1); //~ ERROR use of unstable item let _ = UnstableTupleStruct (1); //~ ERROR use of unstable item let _ = UnmarkedTupleStruct (1); //~ ERROR use of unmarked item let _ = StableTupleStruct (1); - let _ = FrozenTupleStruct (1); - let _ = LockedTupleStruct (1); // At the moment, the lint checker only checks stability in // in the arguments of macros. @@ -129,8 +93,6 @@ mod cross_crate { fn test_method_param(foo: F) { foo.trait_deprecated(); //~ ERROR use of deprecated item foo.trait_deprecated_text(); //~ ERROR use of deprecated item: text - foo.trait_experimental(); //~ ERROR use of unstable item - foo.trait_experimental_text(); //~ ERROR use of unstable item: text foo.trait_unstable(); //~ ERROR use of unstable item foo.trait_unstable_text(); //~ ERROR use of unstable item: text foo.trait_unmarked(); //~ ERROR use of unmarked item @@ -140,8 +102,6 @@ mod cross_crate { fn test_method_object(foo: &Trait) { foo.trait_deprecated(); //~ ERROR use of deprecated item foo.trait_deprecated_text(); //~ ERROR use of deprecated item: text - foo.trait_experimental(); //~ ERROR use of unstable item - foo.trait_experimental_text(); //~ ERROR use of unstable item: text foo.trait_unstable(); //~ ERROR use of unstable item foo.trait_unstable_text(); //~ ERROR use of unstable item: text foo.trait_unmarked(); //~ ERROR use of unmarked item @@ -150,9 +110,9 @@ mod cross_crate { struct S; - impl ExperimentalTrait for S { } //~ ERROR use of unstable item + impl UnstableTrait for S { } //~ ERROR use of unstable item - trait LocalTrait : ExperimentalTrait { } //~ ERROR use of unstable item + trait LocalTrait : UnstableTrait { } //~ ERROR use of unstable item } mod inheritance { @@ -160,191 +120,119 @@ mod inheritance { use self::inherited_stability::*; fn test_inheritance() { - experimental(); //~ ERROR use of unstable item + unstable(); //~ ERROR use of unstable item stable(); - stable_mod::experimental(); //~ ERROR use of unstable item + stable_mod::unstable(); //~ ERROR use of unstable item stable_mod::stable(); - unstable_mod::experimental(); //~ ERROR use of unstable item + unstable_mod::deprecated(); //~ ERROR use of deprecated item unstable_mod::unstable(); //~ ERROR use of unstable item - experimental_mod::experimental(); //~ ERROR use of unstable item - experimental_mod::stable(); - - let _ = Experimental::ExperimentalVariant; //~ ERROR use of unstable item - let _ = Experimental::StableVariant; + let _ = Unstable::UnstableVariant; //~ ERROR use of unstable item + let _ = Unstable::StableVariant; let x: usize = 0; - x.experimental(); //~ ERROR use of unstable item + x.unstable(); //~ ERROR use of unstable item x.stable(); } } mod this_crate { - #[deprecated] + #[deprecated(feature = "oldstuff", since = "1.0.0")] pub fn deprecated() {} - #[deprecated="text"] + #[deprecated(feature = "oldstuff", since = "1.0.0", reason = "text")] pub fn deprecated_text() {} - #[unstable] - pub fn experimental() {} - #[unstable="text"] - pub fn experimental_text() {} - - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn unstable() {} - #[unstable="text"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "text")] pub fn unstable_text() {} pub fn unmarked() {} - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn stable() {} - #[stable="text"] + #[stable(feature = "grandfathered", since = "1.0.0", reason = "text")] pub fn stable_text() {} - #[locked] - pub fn locked() {} - #[locked="text"] - pub fn locked_text() {} - - #[frozen] - pub fn frozen() {} - #[frozen="text"] - pub fn frozen_text() {} - - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub struct MethodTester; impl MethodTester { - #[deprecated] + #[deprecated(feature = "oldstuff", since = "1.0.0")] pub fn method_deprecated(&self) {} - #[deprecated="text"] + #[deprecated(feature = "oldstuff", since = "1.0.0", reason = "text")] pub fn method_deprecated_text(&self) {} - #[unstable] - pub fn method_experimental(&self) {} - #[unstable="text"] - pub fn method_experimental_text(&self) {} - - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] pub fn method_unstable(&self) {} - #[unstable="text"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "text")] pub fn method_unstable_text(&self) {} pub fn method_unmarked(&self) {} - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub fn method_stable(&self) {} - #[stable="text"] + #[stable(feature = "grandfathered", since = "1.0.0", reason = "text")] pub fn method_stable_text(&self) {} - - #[locked] - pub fn method_locked(&self) {} - #[locked="text"] - pub fn method_locked_text(&self) {} - - #[frozen] - pub fn method_frozen(&self) {} - #[frozen="text"] - pub fn method_frozen_text(&self) {} } pub trait Trait { - #[deprecated] + #[deprecated(feature = "oldstuff", since = "1.0.0")] fn trait_deprecated(&self) {} - #[deprecated="text"] + #[deprecated(feature = "oldstuff", since = "1.0.0", reason = "text")] fn trait_deprecated_text(&self) {} - #[unstable] - fn trait_experimental(&self) {} - #[unstable="text"] - fn trait_experimental_text(&self) {} - - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] fn trait_unstable(&self) {} - #[unstable="text"] + #[unstable(feature = "unnamed_feature", since = "1.0.0", reason = "text")] fn trait_unstable_text(&self) {} fn trait_unmarked(&self) {} - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] fn trait_stable(&self) {} - #[stable="text"] + #[stable(feature = "grandfathered", since = "1.0.0", reason = "text")] fn trait_stable_text(&self) {} - - #[locked] - fn trait_locked(&self) {} - #[locked="text"] - fn trait_locked_text(&self) {} - - #[frozen] - fn trait_frozen(&self) {} - #[frozen="text"] - fn trait_frozen_text(&self) {} } impl Trait for MethodTester {} - #[deprecated] + #[deprecated(feature = "oldstuff", since = "1.0.0")] pub struct DeprecatedStruct { i: isize } - #[unstable] - pub struct ExperimentalStruct { i: isize } - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] pub struct UnstableStruct { i: isize } pub struct UnmarkedStruct { i: isize } - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub struct StableStruct { i: isize } - #[frozen] - pub struct FrozenStruct { i: isize } - #[locked] - pub struct LockedStruct { i: isize } - #[deprecated] + #[deprecated(feature = "oldstuff", since = "1.0.0")] pub struct DeprecatedUnitStruct; - #[unstable] - pub struct ExperimentalUnitStruct; - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] pub struct UnstableUnitStruct; pub struct UnmarkedUnitStruct; - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub struct StableUnitStruct; - #[frozen] - pub struct FrozenUnitStruct; - #[locked] - pub struct LockedUnitStruct; pub enum Enum { - #[deprecated] + #[deprecated(feature = "oldstuff", since = "1.0.0")] DeprecatedVariant, - #[unstable] - ExperimentalVariant, - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] UnstableVariant, UnmarkedVariant, - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] StableVariant, - #[frozen] - FrozenVariant, - #[locked] - LockedVariant, } - #[deprecated] + #[deprecated(feature = "oldstuff", since = "1.0.0")] pub struct DeprecatedTupleStruct(isize); - #[unstable] - pub struct ExperimentalTupleStruct(isize); - #[unstable] + #[unstable(feature = "unnamed_feature", since = "1.0.0")] pub struct UnstableTupleStruct(isize); pub struct UnmarkedTupleStruct(isize); - #[stable] + #[stable(feature = "grandfathered", since = "1.0.0")] pub struct StableTupleStruct(isize); - #[frozen] - pub struct FrozenTupleStruct(isize); - #[locked] - pub struct LockedTupleStruct(isize); fn test() { // Only the deprecated cases of the following should generate @@ -361,14 +249,6 @@ mod this_crate { foo.method_deprecated_text(); //~ ERROR use of deprecated item: text foo.trait_deprecated_text(); //~ ERROR use of deprecated item: text - experimental(); - foo.method_experimental(); - foo.trait_experimental(); - - experimental_text(); - foo.method_experimental_text(); - foo.trait_experimental_text(); - unstable(); foo.method_unstable(); foo.trait_unstable(); @@ -389,60 +269,30 @@ mod this_crate { foo.method_stable_text(); foo.trait_stable_text(); - frozen(); - foo.method_frozen(); - foo.trait_frozen(); - - frozen_text(); - foo.method_frozen_text(); - foo.trait_frozen_text(); - - locked(); - foo.method_locked(); - foo.trait_locked(); - - locked_text(); - foo.method_locked_text(); - foo.trait_locked_text(); - let _ = DeprecatedStruct { i: 0 }; //~ ERROR use of deprecated item - let _ = ExperimentalStruct { i: 0 }; let _ = UnstableStruct { i: 0 }; let _ = UnmarkedStruct { i: 0 }; let _ = StableStruct { i: 0 }; - let _ = FrozenStruct { i: 0 }; - let _ = LockedStruct { i: 0 }; let _ = DeprecatedUnitStruct; //~ ERROR use of deprecated item - let _ = ExperimentalUnitStruct; let _ = UnstableUnitStruct; let _ = UnmarkedUnitStruct; let _ = StableUnitStruct; - let _ = FrozenUnitStruct; - let _ = LockedUnitStruct; let _ = Enum::DeprecatedVariant; //~ ERROR use of deprecated item - let _ = Enum::ExperimentalVariant; let _ = Enum::UnstableVariant; let _ = Enum::UnmarkedVariant; let _ = Enum::StableVariant; - let _ = Enum::FrozenVariant; - let _ = Enum::LockedVariant; let _ = DeprecatedTupleStruct (1); //~ ERROR use of deprecated item - let _ = ExperimentalTupleStruct (1); let _ = UnstableTupleStruct (1); let _ = UnmarkedTupleStruct (1); let _ = StableTupleStruct (1); - let _ = FrozenTupleStruct (1); - let _ = LockedTupleStruct (1); } fn test_method_param(foo: F) { foo.trait_deprecated(); //~ ERROR use of deprecated item foo.trait_deprecated_text(); //~ ERROR use of deprecated item: text - foo.trait_experimental(); - foo.trait_experimental_text(); foo.trait_unstable(); foo.trait_unstable_text(); foo.trait_unmarked(); @@ -452,29 +302,27 @@ mod this_crate { fn test_method_object(foo: &Trait) { foo.trait_deprecated(); //~ ERROR use of deprecated item foo.trait_deprecated_text(); //~ ERROR use of deprecated item: text - foo.trait_experimental(); - foo.trait_experimental_text(); foo.trait_unstable(); foo.trait_unstable_text(); foo.trait_unmarked(); foo.trait_stable(); } - #[deprecated] + #[deprecated(feature = "oldstuff", since = "1.0.0")] fn test_fn_body() { fn fn_in_body() {} fn_in_body(); } impl MethodTester { - #[deprecated] + #[deprecated(feature = "oldstuff", since = "1.0.0")] fn test_method_body(&self) { fn fn_in_body() {} fn_in_body(); } } - #[deprecated] + #[deprecated(feature = "oldstuff", since = "1.0.0")] pub trait DeprecatedTrait {} struct S;