about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorBrendan Zabarauskas <bjzaba@yahoo.com.au>2014-11-15 22:09:26 +1100
committerBrendan Zabarauskas <bjzaba@yahoo.com.au>2014-11-16 12:41:55 +1100
commit2d8ca045d6d143819fe386bff37ff7ecb0e380d0 (patch)
tree412dc5b62323f829c9fe5151f6ed5b2dfb2a322f /src/libstd
parent8b156724a3ebe9fe1f1a590dfb626a31b2680145 (diff)
downloadrust-2d8ca045d6d143819fe386bff37ff7ecb0e380d0.tar.gz
rust-2d8ca045d6d143819fe386bff37ff7ecb0e380d0.zip
Rename IntoStr to IntoString
For consistancy with ToString
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/ascii.rs4
-rw-r--r--src/libstd/prelude.rs2
-rw-r--r--src/libstd/to_string.rs2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/libstd/ascii.rs b/src/libstd/ascii.rs
index ff83027d280..56b048c3187 100644
--- a/src/libstd/ascii.rs
+++ b/src/libstd/ascii.rs
@@ -22,7 +22,7 @@ use option::{Option, Some, None};
 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 @@ impl AsciiStr for [Ascii] {
     }
 }
 
-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 4ab09a2a864..47dd07081d0 100644
--- 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 c19fd81b570..737e467f19c 100644
--- 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;
 }