about summary refs log tree commit diff
path: root/src/libcollections
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-01-05 18:41:55 -0800
committerAlex Crichton <alex@alexcrichton.com>2015-01-05 18:41:55 -0800
commit83c890b4542abf60f833df3da1924ed3ce559862 (patch)
tree8279e3e96d461a35255f861a48026c4cce38528e /src/libcollections
parent59bbf56d4917d2776d8acd6ef1a44088486d71bd (diff)
parent4236c52e34cd005af86ea9e5f199daeea9bb8fcb (diff)
downloadrust-83c890b4542abf60f833df3da1924ed3ce559862.tar.gz
rust-83c890b4542abf60f833df3da1924ed3ce559862.zip
rollup merge of #20565: alexcrichton/missing-stability
Conflicts:
	src/libstd/sync/mpsc/mod.rs
Diffstat (limited to 'src/libcollections')
-rw-r--r--src/libcollections/str.rs3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libcollections/str.rs b/src/libcollections/str.rs
index 9f3ab6dd5c0..4a5dcb51322 100644
--- a/src/libcollections/str.rs
+++ b/src/libcollections/str.rs
@@ -50,6 +50,7 @@
 //! is the same as `&[u8]`.
 
 #![doc(primitive = "str")]
+#![stable]
 
 use self::RecompositionState::*;
 use self::DecompositionType::*;
@@ -407,6 +408,7 @@ Section: Trait implementations
 */
 
 /// Any string that can be represented as a slice.
+#[stable]
 pub trait StrExt for Sized?: ops::Slice<uint, str> {
     /// Escapes each char in `s` with `char::escape_default`.
     #[unstable = "return type may change to be an iterator"]
@@ -1346,6 +1348,7 @@ pub trait StrExt for Sized?: ops::Slice<uint, str> {
     }
 }
 
+#[stable]
 impl StrExt for str {}
 
 #[cfg(test)]