rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Rename IntoStr to IntoString

Browse Source 
For consistancy with ToString
This commit is contained in:
Brendan Zabarauskas
2014-11-15 22:09:26 +11:00
parent 8b156724a3
commit 2d8ca045d6
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/etc/vim/syntax/rust.vim
View File

@@ -105,7 +105,7 @@ syn keyword rustTrait RawPtr
syn keyword rustTrait Buffer Writer Reader Seek syn keyword rustTrait Buffer Writer Reader Seek
syn keyword rustTrait Str StrVector StrSlice syn keyword rustTrait Str StrVector StrSlice
syn keyword rustTrait IntoMaybeOwned StrAllocating UnicodeStrSlice 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 Tuple1 Tuple2 Tuple3 Tuple4
syn keyword rustTrait Tuple5 Tuple6 Tuple7 Tuple8 syn keyword rustTrait Tuple5 Tuple6 Tuple7 Tuple8
syn keyword rustTrait Tuple9 Tuple10 Tuple11 Tuple12 syn keyword rustTrait Tuple9 Tuple10 Tuple11 Tuple12

4
src/libstd/ascii.rs
View File

@@ -22,7 +22,7 @@ use option::{Option, Some, None};
use slice::{SlicePrelude, AsSlice}; use slice::{SlicePrelude, AsSlice};
use str::{Str, StrPrelude}; use str::{Str, StrPrelude};
use string::{mod, String}; use string::{mod, String};
use to_string::IntoStr; use to_string::IntoString;
use vec::Vec; use vec::Vec;
/// Datatype to hold one ascii character. It wraps a `u8`, with the highest bit always zero. /// 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] #[inline]
fn into_string(self) -> String { fn into_string(self) -> String {
unsafe { unsafe {

2
src/libstd/prelude.rs
View File

@@ -76,7 +76,7 @@
#[doc(no_inline)] pub use io::{Buffer, Writer, Reader, Seek}; #[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::{Str, StrVector, StrPrelude};
#[doc(no_inline)] pub use str::{IntoMaybeOwned, StrAllocating, UnicodeStrPrelude}; #[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::{Tuple1, Tuple2, Tuple3, Tuple4};
#[doc(no_inline)] pub use tuple::{Tuple5, Tuple6, Tuple7, Tuple8}; #[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 tuple::{Tuple9, Tuple10, Tuple11, Tuple12};

2
src/libstd/to_string.rs
View File

@@ -26,7 +26,7 @@ pub trait ToString {
} }
/// Trait for converting a type to a string, consuming it in the process. /// 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. /// Consume and convert to a string.
fn into_string(self) -> String; fn into_string(self) -> String;
} }