std: Rename various slice traits for consistency
ImmutableVector -> ImmutableSlice ImmutableEqVector -> ImmutableEqSlice ImmutableOrdVector -> ImmutableOrdSlice MutableVector -> MutableSlice MutableVectorAllocating -> MutableSliceAllocating MutableCloneableVector -> MutableCloneableSlice MutableOrdVector -> MutableOrdSlice These are all in the prelude so most code will not break. [breaking-change]
This commit is contained in:
parent
d917770792
commit
4f5b6927e8
46 changed files with 80 additions and 80 deletions
|
|
@ -19,7 +19,7 @@ use fmt;
|
|||
use iter::Iterator;
|
||||
use mem;
|
||||
use option::{Option, Some, None};
|
||||
use slice::{ImmutableVector, MutableVector, Vector};
|
||||
use slice::{ImmutableSlice, MutableSlice, Vector};
|
||||
use str::{Str, StrSlice};
|
||||
use str;
|
||||
use string::String;
|
||||
|
|
|
|||
|
|
@ -2743,7 +2743,7 @@ mod test_set {
|
|||
use prelude::*;
|
||||
|
||||
use super::HashSet;
|
||||
use slice::ImmutableEqVector;
|
||||
use slice::ImmutableEqSlice;
|
||||
use collections::Collection;
|
||||
|
||||
#[test]
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ use option::*;
|
|||
use os;
|
||||
use path::{Path,GenericPath};
|
||||
use result::*;
|
||||
use slice::{Vector,ImmutableVector};
|
||||
use slice::{Vector,ImmutableSlice};
|
||||
use str;
|
||||
use string::String;
|
||||
use vec::Vec;
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ use iter::ExactSize;
|
|||
use ops::Drop;
|
||||
use option::{Some, None, Option};
|
||||
use result::{Ok, Err};
|
||||
use slice::{ImmutableVector, MutableVector};
|
||||
use slice::{ImmutableSlice, MutableSlice};
|
||||
use slice;
|
||||
use vec::Vec;
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ use comm::{Sender, Receiver};
|
|||
use io;
|
||||
use option::{None, Option, Some};
|
||||
use result::{Ok, Err};
|
||||
use slice::{bytes, MutableVector, ImmutableVector};
|
||||
use slice::{bytes, MutableSlice, ImmutableSlice};
|
||||
use str::StrSlice;
|
||||
use super::{Reader, Writer, IoResult};
|
||||
use vec::Vec;
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ use option::{Option, Some, None};
|
|||
use result::{Ok, Err};
|
||||
use io;
|
||||
use io::{IoError, IoResult, Reader};
|
||||
use slice::{ImmutableVector, Vector};
|
||||
use slice::{ImmutableSlice, Vector};
|
||||
use ptr::RawPtr;
|
||||
|
||||
/// An iterator that reads a single byte on each iteration,
|
||||
|
|
@ -153,7 +153,7 @@ pub fn u64_to_be_bytes<T>(n: u64, size: uint, f: |v: &[u8]| -> T) -> T {
|
|||
pub fn u64_from_be_bytes(data: &[u8], start: uint, size: uint) -> u64 {
|
||||
use ptr::{copy_nonoverlapping_memory};
|
||||
use mem::from_be64;
|
||||
use slice::MutableVector;
|
||||
use slice::MutableSlice;
|
||||
|
||||
assert!(size <= 8u);
|
||||
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ use path;
|
|||
use result::{Err, Ok};
|
||||
use rt::rtio::LocalIo;
|
||||
use rt::rtio;
|
||||
use slice::ImmutableVector;
|
||||
use slice::ImmutableSlice;
|
||||
use string::String;
|
||||
use vec::Vec;
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ use result::{Err, Ok};
|
|||
use io;
|
||||
use io::{Reader, Writer, Seek, Buffer, IoError, SeekStyle, IoResult};
|
||||
use slice;
|
||||
use slice::{Vector, ImmutableVector, MutableVector};
|
||||
use slice::{Vector, ImmutableSlice, MutableSlice};
|
||||
use vec::Vec;
|
||||
|
||||
static BUF_CAPACITY: uint = 128;
|
||||
|
|
|
|||
|
|
@ -235,7 +235,7 @@ use os;
|
|||
use boxed::Box;
|
||||
use result::{Ok, Err, Result};
|
||||
use rt::rtio;
|
||||
use slice::{Vector, MutableVector, ImmutableVector};
|
||||
use slice::{Vector, MutableSlice, ImmutableSlice};
|
||||
use str::{Str, StrSlice};
|
||||
use str;
|
||||
use string::String;
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ use from_str::FromStr;
|
|||
use iter::Iterator;
|
||||
use option::{Option, None, Some};
|
||||
use str::StrSlice;
|
||||
use slice::{MutableCloneableVector, ImmutableVector, MutableVector};
|
||||
use slice::{MutableCloneableSlice, ImmutableSlice, MutableSlice};
|
||||
|
||||
pub type Port = u16;
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ use clone::Clone;
|
|||
use collections::MutableSeq;
|
||||
use io::IoResult;
|
||||
use iter::Iterator;
|
||||
use slice::ImmutableVector;
|
||||
use slice::ImmutableSlice;
|
||||
use result::{Ok,Err};
|
||||
use io::net::addrinfo::get_host_addresses;
|
||||
use io::net::ip::SocketAddr;
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ use option::{Some, None};
|
|||
use boxed::Box;
|
||||
use result::{Ok, Err};
|
||||
use rt::rtio::{IoFactory, LocalIo, RtioSignal, Callback};
|
||||
use slice::ImmutableVector;
|
||||
use slice::ImmutableSlice;
|
||||
use vec::Vec;
|
||||
|
||||
/// Signals that can be sent and received
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ use rt;
|
|||
use rt::local::Local;
|
||||
use rt::task::Task;
|
||||
use rt::rtio::{DontClose, IoFactory, LocalIo, RtioFileStream, RtioTTY};
|
||||
use slice::ImmutableVector;
|
||||
use slice::ImmutableSlice;
|
||||
use str::StrSlice;
|
||||
use uint;
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ use from_str::FromStr;
|
|||
use num::{ToStrRadix, FromStrRadix};
|
||||
use num::strconv;
|
||||
use option::Option;
|
||||
use slice::ImmutableVector;
|
||||
use slice::ImmutableSlice;
|
||||
use string::String;
|
||||
|
||||
pub use core::i16::{BITS, BYTES, MIN, MAX};
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ use from_str::FromStr;
|
|||
use num::{ToStrRadix, FromStrRadix};
|
||||
use num::strconv;
|
||||
use option::Option;
|
||||
use slice::ImmutableVector;
|
||||
use slice::ImmutableSlice;
|
||||
use string::String;
|
||||
|
||||
pub use core::i32::{BITS, BYTES, MIN, MAX};
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ use from_str::FromStr;
|
|||
use num::{ToStrRadix, FromStrRadix};
|
||||
use num::strconv;
|
||||
use option::Option;
|
||||
use slice::ImmutableVector;
|
||||
use slice::ImmutableSlice;
|
||||
use string::String;
|
||||
|
||||
pub use core::i64::{BITS, BYTES, MIN, MAX};
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ use from_str::FromStr;
|
|||
use num::{ToStrRadix, FromStrRadix};
|
||||
use num::strconv;
|
||||
use option::Option;
|
||||
use slice::ImmutableVector;
|
||||
use slice::ImmutableSlice;
|
||||
use string::String;
|
||||
|
||||
pub use core::i8::{BITS, BYTES, MIN, MAX};
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ use from_str::FromStr;
|
|||
use num::{ToStrRadix, FromStrRadix};
|
||||
use num::strconv;
|
||||
use option::Option;
|
||||
use slice::ImmutableVector;
|
||||
use slice::ImmutableSlice;
|
||||
use string::String;
|
||||
|
||||
pub use core::int::{BITS, BYTES, MIN, MAX};
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ use num::{Float, FPNaN, FPInfinite, ToPrimitive};
|
|||
use num;
|
||||
use ops::{Add, Sub, Mul, Div, Rem, Neg};
|
||||
use option::{None, Option, Some};
|
||||
use slice::{ImmutableVector, MutableVector};
|
||||
use slice::{ImmutableSlice, MutableSlice};
|
||||
use std::cmp::{PartialOrd, PartialEq};
|
||||
use str::StrSlice;
|
||||
use string::String;
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ use from_str::FromStr;
|
|||
use num::{ToStrRadix, FromStrRadix};
|
||||
use num::strconv;
|
||||
use option::Option;
|
||||
use slice::ImmutableVector;
|
||||
use slice::ImmutableSlice;
|
||||
use string::String;
|
||||
|
||||
pub use core::u16::{BITS, BYTES, MIN, MAX};
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ use from_str::FromStr;
|
|||
use num::{ToStrRadix, FromStrRadix};
|
||||
use num::strconv;
|
||||
use option::Option;
|
||||
use slice::ImmutableVector;
|
||||
use slice::ImmutableSlice;
|
||||
use string::String;
|
||||
|
||||
pub use core::u32::{BITS, BYTES, MIN, MAX};
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ use from_str::FromStr;
|
|||
use num::{ToStrRadix, FromStrRadix};
|
||||
use num::strconv;
|
||||
use option::Option;
|
||||
use slice::ImmutableVector;
|
||||
use slice::ImmutableSlice;
|
||||
use string::String;
|
||||
|
||||
pub use core::u64::{BITS, BYTES, MIN, MAX};
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ use from_str::FromStr;
|
|||
use num::{ToStrRadix, FromStrRadix};
|
||||
use num::strconv;
|
||||
use option::Option;
|
||||
use slice::ImmutableVector;
|
||||
use slice::ImmutableSlice;
|
||||
use string::String;
|
||||
|
||||
pub use core::u8::{BITS, BYTES, MIN, MAX};
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ use from_str::FromStr;
|
|||
use num::{ToStrRadix, FromStrRadix};
|
||||
use num::strconv;
|
||||
use option::Option;
|
||||
use slice::ImmutableVector;
|
||||
use slice::ImmutableSlice;
|
||||
use string::String;
|
||||
|
||||
pub use core::uint::{BITS, BYTES, MIN, MAX};
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ use path::{Path, GenericPath, BytesContainer};
|
|||
use ptr::RawPtr;
|
||||
use ptr;
|
||||
use result::{Err, Ok, Result};
|
||||
use slice::{Vector, ImmutableVector, MutableVector, ImmutableEqVector};
|
||||
use slice::{Vector, ImmutableSlice, MutableSlice, ImmutableEqSlice};
|
||||
use str::{Str, StrSlice, StrAllocating};
|
||||
use string::String;
|
||||
use sync::atomic::{AtomicInt, INIT_ATOMIC_INT, SeqCst};
|
||||
|
|
@ -145,7 +145,7 @@ pub mod win32 {
|
|||
use option::{None, Option};
|
||||
use option;
|
||||
use os::TMPBUF_SZ;
|
||||
use slice::{MutableVector, ImmutableVector};
|
||||
use slice::{MutableSlice, ImmutableSlice};
|
||||
use string::String;
|
||||
use str::StrSlice;
|
||||
use vec::Vec;
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@ use str;
|
|||
use str::{MaybeOwned, Str, StrSlice};
|
||||
use string::String;
|
||||
use slice::Vector;
|
||||
use slice::{ImmutableEqVector, ImmutableVector};
|
||||
use slice::{ImmutableEqSlice, ImmutableSlice};
|
||||
use vec::Vec;
|
||||
|
||||
/// Typedef for POSIX file paths.
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ use option::{Option, None, Some};
|
|||
use str::Str;
|
||||
use str;
|
||||
use slice::{CloneableVector, Splits, Vector, VectorVector,
|
||||
ImmutableEqVector, ImmutableVector};
|
||||
ImmutableEqSlice, ImmutableSlice};
|
||||
use vec::Vec;
|
||||
|
||||
use super::{BytesContainer, GenericPath, GenericPathUnsafe};
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ use io::Writer;
|
|||
use iter::{AdditiveIterator, DoubleEndedIterator, Extendable, Iterator, Map};
|
||||
use mem;
|
||||
use option::{Option, Some, None};
|
||||
use slice::{Vector, ImmutableVector};
|
||||
use slice::{Vector, ImmutableSlice};
|
||||
use str::{CharSplits, Str, StrAllocating, StrVector, StrSlice};
|
||||
use string::String;
|
||||
use unicode::char::UnicodeChar;
|
||||
|
|
|
|||
|
|
@ -83,11 +83,11 @@
|
|||
#[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 slice::{CloneableVector, ImmutableCloneableVector};
|
||||
#[doc(no_inline)] pub use slice::{MutableCloneableVector, MutableOrdVector};
|
||||
#[doc(no_inline)] pub use slice::{ImmutableVector, MutableVector};
|
||||
#[doc(no_inline)] pub use slice::{ImmutableEqVector, ImmutableOrdVector};
|
||||
#[doc(no_inline)] pub use slice::{MutableCloneableSlice, MutableOrdSlice};
|
||||
#[doc(no_inline)] pub use slice::{ImmutableSlice, MutableSlice};
|
||||
#[doc(no_inline)] pub use slice::{ImmutableEqSlice, ImmutableOrdSlice};
|
||||
#[doc(no_inline)] pub use slice::{Vector, VectorVector};
|
||||
#[doc(no_inline)] pub use slice::MutableVectorAllocating;
|
||||
#[doc(no_inline)] pub use slice::MutableSliceAllocating;
|
||||
#[doc(no_inline)] pub use string::String;
|
||||
#[doc(no_inline)] pub use vec::Vec;
|
||||
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ mod imp {
|
|||
use rand::Rng;
|
||||
use result::{Ok};
|
||||
use self::libc::{c_int, size_t};
|
||||
use slice::MutableVector;
|
||||
use slice::MutableSlice;
|
||||
|
||||
/// A random number generator that retrieves randomness straight from
|
||||
/// the operating system. Platform sources:
|
||||
|
|
@ -138,7 +138,7 @@ mod imp {
|
|||
use rt::stack;
|
||||
use self::libc::{DWORD, BYTE, LPCSTR, BOOL};
|
||||
use self::libc::types::os::arch::extra::{LONG_PTR};
|
||||
use slice::MutableVector;
|
||||
use slice::MutableSlice;
|
||||
|
||||
type HCRYPTPROV = LONG_PTR;
|
||||
|
||||
|
|
|
|||
|
|
@ -258,7 +258,7 @@ mod imp {
|
|||
pub fn write(w: &mut Writer) -> IoResult<()> {
|
||||
use iter::{Iterator, range};
|
||||
use result;
|
||||
use slice::{MutableVector};
|
||||
use slice::{MutableSlice};
|
||||
|
||||
extern {
|
||||
fn backtrace(buf: *mut *mut libc::c_void,
|
||||
|
|
@ -398,7 +398,7 @@ mod imp {
|
|||
use path::GenericPath;
|
||||
use ptr::RawPtr;
|
||||
use ptr;
|
||||
use slice::{ImmutableVector, MutableVector};
|
||||
use slice::{ImmutableSlice, MutableSlice};
|
||||
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
// libbacktrace.h API
|
||||
|
|
@ -670,7 +670,7 @@ mod imp {
|
|||
use path::Path;
|
||||
use result::{Ok, Err};
|
||||
use rt::mutex::{StaticNativeMutex, NATIVE_MUTEX_INIT};
|
||||
use slice::ImmutableVector;
|
||||
use slice::ImmutableSlice;
|
||||
use str::StrSlice;
|
||||
use dynamic_lib::DynamicLibrary;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue