diff --git a/src/etc/vim/syntax/rust.vim b/src/etc/vim/syntax/rust.vim index 9131c4faa80..aa0549a861c 100644 --- a/src/etc/vim/syntax/rust.vim +++ b/src/etc/vim/syntax/rust.vim @@ -66,7 +66,7 @@ syn keyword rustEnumVariant Ok Err " Types and traits {{{3 syn keyword rustTrait Any AnyOwnExt AnyRefExt AnyMutRefExt -syn keyword rustTrait Ascii AsciiCast OwnedAsciiCast AsciiStr ToBytesConsume +syn keyword rustTrait Ascii AsciiCast OwnedAsciiCast AsciiStr IntoBytes syn keyword rustTrait Bool syn keyword rustTrait ToCStr syn keyword rustTrait Char @@ -94,7 +94,7 @@ syn keyword rustTrait Buffer Writer Reader Seek syn keyword rustTrait SendStr SendStrOwned SendStrStatic IntoSendStr syn keyword rustTrait Str StrVector StrSlice OwnedStr syn keyword rustTrait IterBytes -syn keyword rustTrait ToStr ToStrConsume +syn keyword rustTrait ToStr IntoStr syn keyword rustTrait CopyableTuple ImmutableTuple syn keyword rustTrait Tuple1 Tuple2 Tuple3 Tuple4 syn keyword rustTrait Tuple5 Tuple6 Tuple7 Tuple8 diff --git a/src/libstd/ascii.rs b/src/libstd/ascii.rs index 2242ded94f5..4cdcbbdb9e8 100644 --- a/src/libstd/ascii.rs +++ b/src/libstd/ascii.rs @@ -10,7 +10,7 @@ //! Operations on ASCII strings and characters. -use to_str::{ToStr,ToStrConsume}; +use to_str::{ToStr,IntoStr}; use str; use str::StrSlice; use str::OwnedStr; @@ -294,7 +294,7 @@ impl<'a> AsciiStr for &'a [Ascii] { } } -impl ToStrConsume for ~[Ascii] { +impl IntoStr for ~[Ascii] { #[inline] fn into_str(self) -> ~str { unsafe { cast::transmute(self) } @@ -309,12 +309,12 @@ impl IterBytes for Ascii { } /// Trait to convert to a owned byte array by consuming self -pub trait ToBytesConsume { +pub trait IntoBytes { /// Converts to a owned byte array by consuming self fn into_bytes(self) -> ~[u8]; } -impl ToBytesConsume for ~[Ascii] { +impl IntoBytes for ~[Ascii] { fn into_bytes(self) -> ~[u8] { unsafe { cast::transmute(self) } } diff --git a/src/libstd/prelude.rs b/src/libstd/prelude.rs index 83439d4c903..6407b34c576 100644 --- a/src/libstd/prelude.rs +++ b/src/libstd/prelude.rs @@ -45,7 +45,7 @@ pub use io::stdio::{print, println}; // Reexported types and traits pub use any::{Any, AnyOwnExt, AnyRefExt, AnyMutRefExt}; -pub use ascii::{Ascii, AsciiCast, OwnedAsciiCast, AsciiStr, ToBytesConsume}; +pub use ascii::{Ascii, AsciiCast, OwnedAsciiCast, AsciiStr, IntoBytes}; pub use bool::Bool; pub use c_str::ToCStr; pub use char::Char; @@ -71,7 +71,7 @@ pub use io::{Buffer, Writer, Reader, Seek}; pub use send_str::{SendStr, SendStrOwned, SendStrStatic, IntoSendStr}; pub use str::{Str, StrVector, StrSlice, OwnedStr}; pub use to_bytes::IterBytes; -pub use to_str::{ToStr, ToStrConsume}; +pub use to_str::{ToStr, IntoStr}; pub use tuple::{CopyableTuple, ImmutableTuple}; pub use tuple::{ImmutableTuple1, ImmutableTuple2, ImmutableTuple3, ImmutableTuple4}; pub use tuple::{ImmutableTuple5, ImmutableTuple6, ImmutableTuple7, ImmutableTuple8}; diff --git a/src/libstd/to_str.rs b/src/libstd/to_str.rs index 41c8aef18f4..a58b09d8ecd 100644 --- a/src/libstd/to_str.rs +++ b/src/libstd/to_str.rs @@ -30,7 +30,7 @@ pub trait ToStr { } /// Trait for converting a type to a string, consuming it in the process. -pub trait ToStrConsume { +pub trait IntoStr { /// Consume and convert to a string. fn into_str(self) -> ~str; }