diff options
Diffstat (limited to 'src/libcollections')
| -rw-r--r-- | src/libcollections/binary_heap.rs | 2 | ||||
| -rw-r--r-- | src/libcollections/borrow.rs | 1 | ||||
| -rw-r--r-- | src/libcollections/btree/node.rs | 1 | ||||
| -rw-r--r-- | src/libcollections/fmt.rs | 8 | ||||
| -rw-r--r-- | src/libcollections/lib.rs | 2 | ||||
| -rw-r--r-- | src/libcollections/linked_list.rs | 2 | ||||
| -rw-r--r-- | src/libcollections/slice.rs | 9 | ||||
| -rw-r--r-- | src/libcollections/str.rs | 14 | ||||
| -rw-r--r-- | src/libcollections/string.rs | 9 | ||||
| -rw-r--r-- | src/libcollections/vec.rs | 6 | ||||
| -rw-r--r-- | src/libcollections/vec_deque.rs | 3 |
11 files changed, 56 insertions, 1 deletions
diff --git a/src/libcollections/binary_heap.rs b/src/libcollections/binary_heap.rs index 57646bef124..db555fe61aa 100644 --- a/src/libcollections/binary_heap.rs +++ b/src/libcollections/binary_heap.rs @@ -731,6 +731,7 @@ impl<'a, T: 'a> DoubleEndedIterator for Drain<'a, T> { #[stable(feature = "rust1", since = "1.0.0")] impl<'a, T: 'a> ExactSizeIterator for Drain<'a, T> {} +#[stable(feature = "rust1", since = "1.0.0")] impl<T: Ord> From<Vec<T>> for BinaryHeap<T> { fn from(vec: Vec<T>) -> BinaryHeap<T> { let mut heap = BinaryHeap { data: vec }; @@ -743,6 +744,7 @@ impl<T: Ord> From<Vec<T>> for BinaryHeap<T> { } } +#[stable(feature = "rust1", since = "1.0.0")] impl<T> From<BinaryHeap<T>> for Vec<T> { fn from(heap: BinaryHeap<T>) -> Vec<T> { heap.data diff --git a/src/libcollections/borrow.rs b/src/libcollections/borrow.rs index 9b8f8c8f5bb..c26b42d016a 100644 --- a/src/libcollections/borrow.rs +++ b/src/libcollections/borrow.rs @@ -24,6 +24,7 @@ use fmt; use self::Cow::*; +#[stable(feature = "rust1", since = "1.0.0")] pub use core::borrow::{Borrow, BorrowMut}; #[stable(feature = "rust1", since = "1.0.0")] diff --git a/src/libcollections/btree/node.rs b/src/libcollections/btree/node.rs index 4380f315ee7..dc4b7a1c3f7 100644 --- a/src/libcollections/btree/node.rs +++ b/src/libcollections/btree/node.rs @@ -451,7 +451,6 @@ impl<K, V> Node<K, V> { } // FIXME(gereeter) Write an efficient clone_from -#[stable(feature = "rust1", since = "1.0.0")] impl<K: Clone, V: Clone> Clone for Node<K, V> { fn clone(&self) -> Node<K, V> { let mut ret = if self.is_leaf() { diff --git a/src/libcollections/fmt.rs b/src/libcollections/fmt.rs index 990575ebbb3..ebc2de4be7a 100644 --- a/src/libcollections/fmt.rs +++ b/src/libcollections/fmt.rs @@ -475,13 +475,21 @@ #![stable(feature = "rust1", since = "1.0.0")] +#[stable(feature = "rust1", since = "1.0.0")] pub use core::fmt::{Formatter, Result, Write, rt}; +#[stable(feature = "rust1", since = "1.0.0")] pub use core::fmt::{Octal, Binary}; +#[stable(feature = "rust1", since = "1.0.0")] pub use core::fmt::{Display, Debug}; +#[stable(feature = "rust1", since = "1.0.0")] pub use core::fmt::{LowerHex, UpperHex, Pointer}; +#[stable(feature = "rust1", since = "1.0.0")] pub use core::fmt::{LowerExp, UpperExp}; +#[stable(feature = "rust1", since = "1.0.0")] pub use core::fmt::Error; +#[stable(feature = "rust1", since = "1.0.0")] pub use core::fmt::{ArgumentV1, Arguments, write, radix, Radix, RadixFmt}; +#[stable(feature = "rust1", since = "1.0.0")] pub use core::fmt::{DebugList, DebugMap, DebugSet, DebugStruct, DebugTuple}; use string; diff --git a/src/libcollections/lib.rs b/src/libcollections/lib.rs index 54b98c6e179..dfdf36e6f60 100644 --- a/src/libcollections/lib.rs +++ b/src/libcollections/lib.rs @@ -107,11 +107,13 @@ pub mod vec_deque; #[stable(feature = "rust1", since = "1.0.0")] pub mod btree_map { + #[stable(feature = "rust1", since = "1.0.0")] pub use btree::map::*; } #[stable(feature = "rust1", since = "1.0.0")] pub mod btree_set { + #[stable(feature = "rust1", since = "1.0.0")] pub use btree::set::*; } diff --git a/src/libcollections/linked_list.rs b/src/libcollections/linked_list.rs index 8e6b0183d53..a689c66eeaf 100644 --- a/src/libcollections/linked_list.rs +++ b/src/libcollections/linked_list.rs @@ -857,6 +857,7 @@ impl<A> DoubleEndedIterator for IntoIter<A> { fn next_back(&mut self) -> Option<A> { self.list.pop_back() } } +#[stable(feature = "rust1", since = "1.0.0")] impl<A> ExactSizeIterator for IntoIter<A> {} #[stable(feature = "rust1", since = "1.0.0")] @@ -890,6 +891,7 @@ impl<'a, T> IntoIterator for &'a LinkedList<T> { } } +#[stable(feature = "rust1", since = "1.0.0")] impl<'a, T> IntoIterator for &'a mut LinkedList<T> { type Item = &'a mut T; type IntoIter = IterMut<'a, T>; diff --git a/src/libcollections/slice.rs b/src/libcollections/slice.rs index 25ff1f1a82a..ec888127983 100644 --- a/src/libcollections/slice.rs +++ b/src/libcollections/slice.rs @@ -102,12 +102,18 @@ use core::slice as core_slice; use borrow::{Borrow, BorrowMut, ToOwned}; use vec::Vec; +#[stable(feature = "rust1", since = "1.0.0")] pub use core::slice::{Chunks, Windows}; +#[stable(feature = "rust1", since = "1.0.0")] pub use core::slice::{Iter, IterMut}; +#[stable(feature = "rust1", since = "1.0.0")] pub use core::slice::{SplitMut, ChunksMut, Split}; +#[stable(feature = "rust1", since = "1.0.0")] pub use core::slice::{SplitN, RSplitN, SplitNMut, RSplitNMut}; +#[unstable(feature = "ref_slice", issue = "27774")] #[allow(deprecated)] pub use core::slice::{bytes, mut_ref_slice, ref_slice}; +#[stable(feature = "rust1", since = "1.0.0")] pub use core::slice::{from_raw_parts, from_raw_parts_mut}; //////////////////////////////////////////////////////////////////////////////// @@ -860,6 +866,9 @@ pub trait SliceConcatExt<T: ?Sized> { fn connect(&self, sep: &T) -> Self::Output; } +#[unstable(feature = "slice_concat_ext", + reason = "trait should not have to exist", + issue = "27747")] impl<T: Clone, V: Borrow<[T]>> SliceConcatExt<T> for [V] { type Output = Vec<T>; diff --git a/src/libcollections/str.rs b/src/libcollections/str.rs index a5013f4e75b..c16ce61a136 100644 --- a/src/libcollections/str.rs +++ b/src/libcollections/str.rs @@ -37,19 +37,33 @@ use vec::Vec; use slice::SliceConcatExt; use boxed::Box; +#[stable(feature = "rust1", since = "1.0.0")] pub use core::str::{FromStr, Utf8Error}; #[allow(deprecated)] +#[stable(feature = "rust1", since = "1.0.0")] pub use core::str::{Lines, LinesAny, CharRange}; +#[stable(feature = "rust1", since = "1.0.0")] pub use core::str::{Split, RSplit}; +#[stable(feature = "rust1", since = "1.0.0")] pub use core::str::{SplitN, RSplitN}; +#[stable(feature = "rust1", since = "1.0.0")] pub use core::str::{SplitTerminator, RSplitTerminator}; +#[stable(feature = "rust1", since = "1.0.0")] pub use core::str::{Matches, RMatches}; +#[stable(feature = "rust1", since = "1.0.0")] pub use core::str::{MatchIndices, RMatchIndices}; +#[stable(feature = "rust1", since = "1.0.0")] pub use core::str::{from_utf8, Chars, CharIndices, Bytes}; +#[stable(feature = "rust1", since = "1.0.0")] pub use core::str::{from_utf8_unchecked, ParseBoolError}; +#[stable(feature = "rust1", since = "1.0.0")] pub use rustc_unicode::str::{SplitWhitespace}; +#[stable(feature = "rust1", since = "1.0.0")] pub use core::str::pattern; +#[unstable(feature = "slice_concat_ext", + reason = "trait should not have to exist", + issue = "27747")] impl<S: Borrow<str>> SliceConcatExt<str> for [S] { type Output = String; diff --git a/src/libcollections/string.rs b/src/libcollections/string.rs index 804e798c600..84667e04e04 100644 --- a/src/libcollections/string.rs +++ b/src/libcollections/string.rs @@ -949,6 +949,9 @@ impl Extend<String> for String { } /// A convenience impl that delegates to the impl for `&str` +#[unstable(feature = "pattern", + reason = "API not fully fleshed out and ready to be stabilized", + issue = "27721")] impl<'a, 'b> Pattern<'a> for &'b String { type Searcher = <&'b str as Pattern<'a>>::Searcher; @@ -1143,24 +1146,28 @@ impl FromStr for String { } } +#[stable(feature = "str_parse_error", since = "1.5.0")] impl Clone for ParseError { fn clone(&self) -> ParseError { match *self {} } } +#[stable(feature = "str_parse_error", since = "1.5.0")] impl fmt::Debug for ParseError { fn fmt(&self, _: &mut fmt::Formatter) -> fmt::Result { match *self {} } } +#[stable(feature = "str_parse_error", since = "1.5.0")] impl PartialEq for ParseError { fn eq(&self, _: &ParseError) -> bool { match *self {} } } +#[stable(feature = "str_parse_error", since = "1.5.0")] impl Eq for ParseError {} /// A generic trait for converting a value to a string @@ -1287,7 +1294,9 @@ pub struct Drain<'a> { iter: Chars<'a>, } +#[unstable(feature = "drain", reason = "recently added", issue = "27711")] unsafe impl<'a> Sync for Drain<'a> {} +#[unstable(feature = "drain", reason = "recently added", issue = "27711")] unsafe impl<'a> Send for Drain<'a> {} #[unstable(feature = "drain", reason = "recently added", issue = "27711")] diff --git a/src/libcollections/vec.rs b/src/libcollections/vec.rs index 9153d624268..a6d0de18eb6 100644 --- a/src/libcollections/vec.rs +++ b/src/libcollections/vec.rs @@ -1471,12 +1471,14 @@ impl<'a, T> FromIterator<T> for Cow<'a, [T]> where T: Clone { } } +#[stable(feature = "rust1", since = "1.0.0")] impl<'a, T: 'a> IntoCow<'a, [T]> for Vec<T> where T: Clone { fn into_cow(self) -> Cow<'a, [T]> { Cow::Owned(self) } } +#[stable(feature = "rust1", since = "1.0.0")] impl<'a, T> IntoCow<'a, [T]> for &'a [T] where T: Clone { fn into_cow(self) -> Cow<'a, [T]> { Cow::Borrowed(self) @@ -1495,7 +1497,9 @@ pub struct IntoIter<T> { end: *const T } +#[stable(feature = "rust1", since = "1.0.0")] unsafe impl<T: Send> Send for IntoIter<T> { } +#[stable(feature = "rust1", since = "1.0.0")] unsafe impl<T: Sync> Sync for IntoIter<T> { } #[stable(feature = "rust1", since = "1.0.0")] @@ -1590,7 +1594,9 @@ pub struct Drain<'a, T: 'a> { vec: *mut Vec<T>, } +#[unstable(feature = "drain", reason = "recently added", issue = "27711")] unsafe impl<'a, T: Sync> Sync for Drain<'a, T> {} +#[unstable(feature = "drain", reason = "recently added", issue = "27711")] unsafe impl<'a, T: Send> Send for Drain<'a, T> {} #[stable(feature = "rust1", since = "1.0.0")] diff --git a/src/libcollections/vec_deque.rs b/src/libcollections/vec_deque.rs index 67db0227cbe..1064fcdd917 100644 --- a/src/libcollections/vec_deque.rs +++ b/src/libcollections/vec_deque.rs @@ -1662,6 +1662,7 @@ pub struct Iter<'a, T:'a> { } // FIXME(#19839) Remove in favor of `#[derive(Clone)]` +#[stable(feature = "rust1", since = "1.0.0")] impl<'a, T> Clone for Iter<'a, T> { fn clone(&self) -> Iter<'a, T> { Iter { @@ -1805,7 +1806,9 @@ pub struct Drain<'a, T: 'a> { deque: *mut VecDeque<T>, } +#[unstable(feature = "drain", issue = "27711")] unsafe impl<'a, T: Sync> Sync for Drain<'a, T> {} +#[unstable(feature = "drain", issue = "27711")] unsafe impl<'a, T: Send> Send for Drain<'a, T> {} #[stable(feature = "rust1", since = "1.0.0")] |
