Skip to content

Commit 2d8ca04

Browse files
committed
Rename IntoStr to IntoString
For consistancy with ToString
1 parent 8b15672 commit 2d8ca04

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

src/etc/vim/syntax/rust.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ syn keyword rustTrait RawPtr
105105
syn keyword rustTrait Buffer Writer Reader Seek
106106
syn keyword rustTrait Str StrVector StrSlice
107107
syn keyword rustTrait IntoMaybeOwned StrAllocating UnicodeStrSlice
108-
syn keyword rustTrait ToString IntoStr
108+
syn keyword rustTrait ToString IntoString
109109
syn keyword rustTrait Tuple1 Tuple2 Tuple3 Tuple4
110110
syn keyword rustTrait Tuple5 Tuple6 Tuple7 Tuple8
111111
syn keyword rustTrait Tuple9 Tuple10 Tuple11 Tuple12

src/libstd/ascii.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use option::{Option, Some, None};
2222
use slice::{SlicePrelude, AsSlice};
2323
use str::{Str, StrPrelude};
2424
use string::{mod, String};
25-
use to_string::IntoStr;
25+
use to_string::IntoString;
2626
use vec::Vec;
2727

2828
/// Datatype to hold one ascii character. It wraps a `u8`, with the highest bit always zero.
@@ -326,7 +326,7 @@ impl AsciiStr for [Ascii] {
326326
}
327327
}
328328

329-
impl IntoStr for Vec<Ascii> {
329+
impl IntoString for Vec<Ascii> {
330330
#[inline]
331331
fn into_string(self) -> String {
332332
unsafe {

src/libstd/prelude.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
#[doc(no_inline)] pub use io::{Buffer, Writer, Reader, Seek};
7777
#[doc(no_inline)] pub use str::{Str, StrVector, StrPrelude};
7878
#[doc(no_inline)] pub use str::{IntoMaybeOwned, StrAllocating, UnicodeStrPrelude};
79-
#[doc(no_inline)] pub use to_string::{ToString, IntoStr};
79+
#[doc(no_inline)] pub use to_string::{ToString, IntoString};
8080
#[doc(no_inline)] pub use tuple::{Tuple1, Tuple2, Tuple3, Tuple4};
8181
#[doc(no_inline)] pub use tuple::{Tuple5, Tuple6, Tuple7, Tuple8};
8282
#[doc(no_inline)] pub use tuple::{Tuple9, Tuple10, Tuple11, Tuple12};

src/libstd/to_string.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ pub trait ToString {
2626
}
2727

2828
/// Trait for converting a type to a string, consuming it in the process.
29-
pub trait IntoStr {
29+
pub trait IntoString {
3030
/// Consume and convert to a string.
3131
fn into_string(self) -> String;
3232
}

0 commit comments

Comments
 (0)