mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-22 14:55:26 +00:00
Rename To{Str,Bytes}Consume traits to Into*.
That is: - `ToStrConsume` → `IntoStr`; - `ToBytesConsume` → `IntoBytes`.
This commit is contained in:
parent
529f915728
commit
b76997f3a9
@ -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
|
||||
|
@ -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) }
|
||||
}
|
||||
|
@ -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};
|
||||
|
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user