Rename IntoStr to IntoString

For consistancy with ToString

diff --git a/src/etc/vim/syntax/rust.vim b/src/etc/vim/syntax/rust.vim
index 710092a3e5f37e168898774fcd7c8a806351fe2a..1b1b65bd560e16fb93b1fd73d6ece63a918f32b7 100644 (file)
--- a/src/etc/vim/syntax/rust.vim
+++ b/src/etc/vim/syntax/rust.vim
@@ -105,7 +105,7 @@ syn keyword rustTrait RawPtr
 syn keyword rustTrait Buffer Writer Reader Seek
 syn keyword rustTrait Str StrVector StrSlice
 syn keyword rustTrait IntoMaybeOwned StrAllocating UnicodeStrSlice
-syn keyword rustTrait ToString IntoStr
+syn keyword rustTrait ToString IntoString
 syn keyword rustTrait Tuple1 Tuple2 Tuple3 Tuple4
 syn keyword rustTrait Tuple5 Tuple6 Tuple7 Tuple8
 syn keyword rustTrait Tuple9 Tuple10 Tuple11 Tuple12

diff --git a/src/libstd/ascii.rs b/src/libstd/ascii.rs
index ff83027d28008594e8b7d2141578f4a1a626d691..56b048c31877adf65ae314ce282308c37305902f 100644 (file)
--- a/src/libstd/ascii.rs
+++ b/src/libstd/ascii.rs
@@ -22,7 +22,7 @@
 use slice::{SlicePrelude, AsSlice};
 use str::{Str, StrPrelude};
 use string::{mod, String};
-use to_string::IntoStr;
+use to_string::IntoString;
 use vec::Vec;
 
 /// Datatype to hold one ascii character. It wraps a `u8`, with the highest bit always zero.
@@ -326,7 +326,7 @@ fn eq_ignore_case(&self, other: &[Ascii]) -> bool {
     }
 }
 
-impl IntoStr for Vec<Ascii> {
+impl IntoString for Vec<Ascii> {
     #[inline]
     fn into_string(self) -> String {
         unsafe {

diff --git a/src/libstd/prelude.rs b/src/libstd/prelude.rs
index 4ab09a2a8641f0f4b60714e273e90396fb548126..47dd07081d0e2904395004ffbf7d864206620ebb 100644 (file)
--- a/src/libstd/prelude.rs
+++ b/src/libstd/prelude.rs
@@ -76,7 +76,7 @@
 #[doc(no_inline)] pub use io::{Buffer, Writer, Reader, Seek};
 #[doc(no_inline)] pub use str::{Str, StrVector, StrPrelude};
 #[doc(no_inline)] pub use str::{IntoMaybeOwned, StrAllocating, UnicodeStrPrelude};
-#[doc(no_inline)] pub use to_string::{ToString, IntoStr};
+#[doc(no_inline)] pub use to_string::{ToString, IntoString};
 #[doc(no_inline)] pub use tuple::{Tuple1, Tuple2, Tuple3, Tuple4};
 #[doc(no_inline)] pub use tuple::{Tuple5, Tuple6, Tuple7, Tuple8};
 #[doc(no_inline)] pub use tuple::{Tuple9, Tuple10, Tuple11, Tuple12};

diff --git a/src/libstd/to_string.rs b/src/libstd/to_string.rs
index c19fd81b5705667185f8a8a9391fca11a9114dba..737e467f19c790d55b91204a65342c88ff60ed06 100644 (file)
--- a/src/libstd/to_string.rs
+++ b/src/libstd/to_string.rs
@@ -26,7 +26,7 @@ pub trait ToString {
 }
 
 /// Trait for converting a type to a string, consuming it in the process.
-pub trait IntoStr {
+pub trait IntoString {
     /// Consume and convert to a string.
     fn into_string(self) -> String;
 }