diff options
| author | Brendan Zabarauskas <bjzaba@yahoo.com.au> | 2014-11-15 23:57:54 +1100 |
|---|---|---|
| committer | Brendan Zabarauskas <bjzaba@yahoo.com.au> | 2014-11-16 12:41:55 +1100 |
| commit | 59abf75d9e810f2a88c6dd0f37cfcbd6989a6446 (patch) | |
| tree | a3ee597b66f94ea16e11e1c4fb6ce56dc571068a /src/libstd | |
| parent | 2d8ca045d6d143819fe386bff37ff7ecb0e380d0 (diff) | |
| download | rust-59abf75d9e810f2a88c6dd0f37cfcbd6989a6446.tar.gz rust-59abf75d9e810f2a88c6dd0f37cfcbd6989a6446.zip | |
Move IntoString to collections::string
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/ascii.rs | 3 | ||||
| -rw-r--r-- | src/libstd/prelude.rs | 4 | ||||
| -rw-r--r-- | src/libstd/to_string.rs | 6 |
3 files changed, 3 insertions, 10 deletions
diff --git a/src/libstd/ascii.rs b/src/libstd/ascii.rs index 56b048c3187..923349b1bf7 100644 --- a/src/libstd/ascii.rs +++ b/src/libstd/ascii.rs @@ -21,8 +21,7 @@ use mem; use option::{Option, Some, None}; use slice::{SlicePrelude, AsSlice}; use str::{Str, StrPrelude}; -use string::{mod, String}; -use to_string::IntoString; +use string::{mod, String, IntoString}; use vec::Vec; /// Datatype to hold one ascii character. It wraps a `u8`, with the highest bit always zero. diff --git a/src/libstd/prelude.rs b/src/libstd/prelude.rs index 47dd07081d0..a75c51b9f9f 100644 --- a/src/libstd/prelude.rs +++ b/src/libstd/prelude.rs @@ -76,14 +76,14 @@ #[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, IntoString}; +#[doc(no_inline)] pub use to_string::ToString; #[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}; #[doc(no_inline)] pub use slice::{SlicePrelude, AsSlice, CloneSlicePrelude}; #[doc(no_inline)] pub use slice::{VectorVector, PartialEqSlicePrelude, OrdSlicePrelude}; #[doc(no_inline)] pub use slice::{CloneSliceAllocPrelude, OrdSliceAllocPrelude, SliceAllocPrelude}; -#[doc(no_inline)] pub use string::String; +#[doc(no_inline)] pub use string::{IntoString, String}; #[doc(no_inline)] pub use vec::Vec; // Reexported runtime types diff --git a/src/libstd/to_string.rs b/src/libstd/to_string.rs index 737e467f19c..327410b320d 100644 --- a/src/libstd/to_string.rs +++ b/src/libstd/to_string.rs @@ -25,12 +25,6 @@ pub trait ToString { fn to_string(&self) -> String; } -/// Trait for converting a type to a string, consuming it in the process. -pub trait IntoString { - /// Consume and convert to a string. - fn into_string(self) -> String; -} - impl<T: fmt::Show> ToString for T { fn to_string(&self) -> String { format!("{}", *self) |