Skip to content

Commit

Permalink
Rename IntoStr to IntoString
Browse files Browse the repository at this point in the history
For consistancy with ToString
  • Loading branch information
brendanzab committed Nov 16, 2014
1 parent 8b15672 commit 2d8ca04
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/etc/vim/syntax/rust.vim
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/libstd/ascii.rs
Expand Up @@ -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.
Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/prelude.rs
Expand Up @@ -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};
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/to_string.rs
Expand Up @@ -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;
}
Expand Down

0 comments on commit 2d8ca04

Please sign in to comment.