From 4f5b6927e8e428239082ecc17b85a0506bcc9a65 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Wed, 6 Aug 2014 18:58:43 -0700 Subject: [PATCH] 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] --- src/libcollections/hash/mod.rs | 2 +- src/libcollections/hash/sip.rs | 2 +- src/libcollections/slice.rs | 18 +++++++++--------- src/libcollections/str.rs | 2 +- src/libcollections/vec.rs | 2 +- src/libcore/fmt/float.rs | 2 +- src/libcore/fmt/mod.rs | 2 +- src/libcore/fmt/num.rs | 2 +- src/libcore/prelude.rs | 6 +++--- src/libcore/slice.rs | 24 ++++++++++++------------ src/libcore/str.rs | 4 ++-- src/libregex/vm.rs | 2 +- src/librlibc/lib.rs | 2 +- src/libstd/ascii.rs | 2 +- src/libstd/collections/hashmap.rs | 2 +- src/libstd/dynamic_lib.rs | 2 +- src/libstd/io/buffered.rs | 2 +- src/libstd/io/comm_adapters.rs | 2 +- src/libstd/io/extensions.rs | 4 ++-- src/libstd/io/fs.rs | 2 +- src/libstd/io/mem.rs | 2 +- src/libstd/io/mod.rs | 2 +- src/libstd/io/net/ip.rs | 2 +- src/libstd/io/net/tcp.rs | 2 +- src/libstd/io/signal.rs | 2 +- src/libstd/io/stdio.rs | 2 +- src/libstd/num/i16.rs | 2 +- src/libstd/num/i32.rs | 2 +- src/libstd/num/i64.rs | 2 +- src/libstd/num/i8.rs | 2 +- src/libstd/num/int.rs | 2 +- src/libstd/num/strconv.rs | 2 +- src/libstd/num/u16.rs | 2 +- src/libstd/num/u32.rs | 2 +- src/libstd/num/u64.rs | 2 +- src/libstd/num/u8.rs | 2 +- src/libstd/num/uint.rs | 2 +- src/libstd/os.rs | 4 ++-- src/libstd/path/mod.rs | 2 +- src/libstd/path/posix.rs | 2 +- src/libstd/path/windows.rs | 2 +- src/libstd/prelude.rs | 8 ++++---- src/libstd/rand/os.rs | 4 ++-- src/libstd/rt/backtrace.rs | 6 +++--- src/libunicode/normalize.rs | 2 +- src/libunicode/tables.rs | 10 +++++----- 46 files changed, 80 insertions(+), 80 deletions(-) diff --git a/src/libcollections/hash/mod.rs b/src/libcollections/hash/mod.rs index 6f8b63953e2..dd07e718af4 100644 --- a/src/libcollections/hash/mod.rs +++ b/src/libcollections/hash/mod.rs @@ -296,7 +296,7 @@ mod tests { use std::prelude::*; use std::mem; - use slice::ImmutableVector; + use slice::ImmutableSlice; use super::{Hash, Hasher, Writer}; struct MyWriterHasher; diff --git a/src/libcollections/hash/sip.rs b/src/libcollections/hash/sip.rs index 485dc8c5959..12888de43a0 100644 --- a/src/libcollections/hash/sip.rs +++ b/src/libcollections/hash/sip.rs @@ -275,7 +275,7 @@ mod tests { use str::Str; use string::String; - use slice::{Vector, ImmutableVector}; + use slice::{Vector, ImmutableSlice}; use vec::Vec; use super::super::{Hash, Writer}; diff --git a/src/libcollections/slice.rs b/src/libcollections/slice.rs index 4c7c7e3ea74..d73fa499848 100644 --- a/src/libcollections/slice.rs +++ b/src/libcollections/slice.rs @@ -45,8 +45,8 @@ ## Traits A number of traits add methods that allow you to accomplish tasks with slices. -These traits include `ImmutableVector`, which is defined for `&[T]` types, -and `MutableVector`, defined for `&mut [T]` types. +These traits include `ImmutableSlice`, which is defined for `&[T]` types, +and `MutableSlice`, defined for `&mut [T]` types. An example is the method `.slice(a, b)` that returns an immutable "view" into a `Vec` or another slice from the index interval `[a, b)`: @@ -98,10 +98,10 @@ use vec::Vec; pub use core::slice::{ref_slice, mut_ref_slice, Splits, Windows}; -pub use core::slice::{Chunks, Vector, ImmutableVector, ImmutableEqVector}; -pub use core::slice::{ImmutableOrdVector, MutableVector, Items, MutItems}; +pub use core::slice::{Chunks, Vector, ImmutableSlice, ImmutableEqSlice}; +pub use core::slice::{ImmutableOrdSlice, MutableSlice, Items, MutItems}; pub use core::slice::{MutSplits, MutChunks}; -pub use core::slice::{bytes, MutableCloneableVector}; +pub use core::slice::{bytes, MutableCloneableSlice}; // Functional utilities @@ -558,7 +558,7 @@ unsafe fn step(ptr: &mut *mut T) -> *mut T { /// Extension methods for vectors such that their elements are /// mutable. -pub trait MutableVectorAllocating<'a, T> { +pub trait MutableSliceAllocating<'a, T> { /// Sort the vector, in place, using `compare` to compare /// elements. /// @@ -604,7 +604,7 @@ pub trait MutableVectorAllocating<'a, T> { fn move_from(self, src: Vec, start: uint, end: uint) -> uint; } -impl<'a,T> MutableVectorAllocating<'a, T> for &'a mut [T] { +impl<'a,T> MutableSliceAllocating<'a, T> for &'a mut [T] { #[inline] fn sort_by(self, compare: |&T, &T| -> Ordering) { merge_sort(self, compare) @@ -621,7 +621,7 @@ fn move_from(self, mut src: Vec, start: uint, end: uint) -> uint { /// Methods for mutable vectors with orderable elements, such as /// in-place sorting. -pub trait MutableOrdVector { +pub trait MutableOrdSlice { /// Sort the vector, in place. /// /// This is equivalent to `self.sort_by(|a, b| a.cmp(b))`. @@ -667,7 +667,7 @@ pub trait MutableOrdVector { fn prev_permutation(self) -> bool; } -impl<'a, T: Ord> MutableOrdVector for &'a mut [T] { +impl<'a, T: Ord> MutableOrdSlice for &'a mut [T] { #[inline] fn sort(self) { self.sort_by(|a,b| a.cmp(b)) diff --git a/src/libcollections/str.rs b/src/libcollections/str.rs index d911ca6bb14..35ecfbd5792 100644 --- a/src/libcollections/str.rs +++ b/src/libcollections/str.rs @@ -894,7 +894,7 @@ mod tests { use {Collection, MutableSeq}; use super::*; - use std::slice::{Vector, ImmutableVector}; + use std::slice::{Vector, ImmutableSlice}; use string::String; use vec::Vec; diff --git a/src/libcollections/vec.rs b/src/libcollections/vec.rs index 6bda0eed66d..4c1530d1bfb 100644 --- a/src/libcollections/vec.rs +++ b/src/libcollections/vec.rs @@ -24,7 +24,7 @@ use core::uint; use {Collection, Mutable, MutableSeq}; -use slice::{MutableOrdVector, MutableVectorAllocating, CloneableVector}; +use slice::{MutableOrdSlice, MutableSliceAllocating, CloneableVector}; use slice::{Items, MutItems}; diff --git a/src/libcore/fmt/float.rs b/src/libcore/fmt/float.rs index 1bfa5168cf7..3a07e43e509 100644 --- a/src/libcore/fmt/float.rs +++ b/src/libcore/fmt/float.rs @@ -17,7 +17,7 @@ use num::{Float, FPNaN, FPInfinite, ToPrimitive, Primitive}; use num::{Zero, One, cast}; use result::Ok; -use slice::{ImmutableVector, MutableVector}; +use slice::{ImmutableSlice, MutableSlice}; use slice; use str::StrSlice; diff --git a/src/libcore/fmt/mod.rs b/src/libcore/fmt/mod.rs index 9cb64747c91..61f0d09453f 100644 --- a/src/libcore/fmt/mod.rs +++ b/src/libcore/fmt/mod.rs @@ -24,7 +24,7 @@ use ops::Deref; use result::{Ok, Err}; use result; -use slice::{Vector, ImmutableVector}; +use slice::{Vector, ImmutableSlice}; use slice; use str::StrSlice; use str; diff --git a/src/libcore/fmt/num.rs b/src/libcore/fmt/num.rs index bba3e4cb9af..21cbafdc605 100644 --- a/src/libcore/fmt/num.rs +++ b/src/libcore/fmt/num.rs @@ -18,7 +18,7 @@ use fmt; use iter::DoubleEndedIterator; use num::{Int, cast, zero}; -use slice::{ImmutableVector, MutableVector}; +use slice::{ImmutableSlice, MutableSlice}; /// A type that represents a specific radix #[doc(hidden)] diff --git a/src/libcore/prelude.rs b/src/libcore/prelude.rs index 5b7c7c8f31a..08a431b0d1f 100644 --- a/src/libcore/prelude.rs +++ b/src/libcore/prelude.rs @@ -61,6 +61,6 @@ pub use tuple::{Tuple1, Tuple2, Tuple3, Tuple4}; pub use tuple::{Tuple5, Tuple6, Tuple7, Tuple8}; pub use tuple::{Tuple9, Tuple10, Tuple11, Tuple12}; -pub use slice::{ImmutableEqVector, ImmutableOrdVector}; -pub use slice::{MutableVector}; -pub use slice::{Vector, ImmutableVector}; +pub use slice::{ImmutableEqSlice, ImmutableOrdSlice}; +pub use slice::{MutableSlice}; +pub use slice::{Vector, ImmutableSlice}; diff --git a/src/libcore/slice.rs b/src/libcore/slice.rs index d3b761f9665..6c8bacaef48 100644 --- a/src/libcore/slice.rs +++ b/src/libcore/slice.rs @@ -54,7 +54,7 @@ // /// Extension methods for vectors -pub trait ImmutableVector<'a, T> { +pub trait ImmutableSlice<'a, T> { /** * Returns a slice of self spanning the interval [`start`, `end`). * @@ -234,7 +234,7 @@ pub trait ImmutableVector<'a, T> { fn pop_ref(&mut self) -> Option<&'a T>; } -impl<'a,T> ImmutableVector<'a, T> for &'a [T] { +impl<'a,T> ImmutableSlice<'a, T> for &'a [T] { #[inline] fn slice(&self, start: uint, end: uint) -> &'a [T] { assert!(start <= end); @@ -401,7 +401,7 @@ fn pop_ref(&mut self) -> Option<&'a T> { /// Extension methods for vectors such that their elements are /// mutable. -pub trait MutableVector<'a, T> { +pub trait MutableSlice<'a, T> { /// Returns a mutable reference to the element at the given index, /// or `None` if the index is out of bounds fn get_mut(self, index: uint) -> Option<&'a mut T>; @@ -607,7 +607,7 @@ pub trait MutableVector<'a, T> { unsafe fn copy_memory(self, src: &[T]); } -impl<'a,T> MutableVector<'a, T> for &'a mut [T] { +impl<'a,T> MutableSlice<'a, T> for &'a mut [T] { #[inline] fn get_mut(self, index: uint) -> Option<&'a mut T> { if index < self.len() { Some(&mut self[index]) } else { None } @@ -755,7 +755,7 @@ unsafe fn copy_memory(self, src: &[T]) { } /// Extension methods for vectors contain `PartialEq` elements. -pub trait ImmutableEqVector { +pub trait ImmutableEqSlice { /// Find the first index containing a matching value fn position_elem(&self, t: &T) -> Option; @@ -772,7 +772,7 @@ pub trait ImmutableEqVector { fn ends_with(&self, needle: &[T]) -> bool; } -impl<'a,T:PartialEq> ImmutableEqVector for &'a [T] { +impl<'a,T:PartialEq> ImmutableEqSlice for &'a [T] { #[inline] fn position_elem(&self, x: &T) -> Option { self.iter().position(|y| *x == *y) @@ -802,7 +802,7 @@ fn ends_with(&self, needle: &[T]) -> bool { } /// Extension methods for vectors containing `Ord` elements. -pub trait ImmutableOrdVector { +pub trait ImmutableOrdSlice { /** * Binary search a sorted vector for a given element. * @@ -811,14 +811,14 @@ pub trait ImmutableOrdVector { fn bsearch_elem(&self, x: &T) -> Option; } -impl<'a, T: Ord> ImmutableOrdVector for &'a [T] { +impl<'a, T: Ord> ImmutableOrdSlice for &'a [T] { fn bsearch_elem(&self, x: &T) -> Option { self.bsearch(|p| p.cmp(x)) } } /// Trait for &[T] where T is Cloneable -pub trait MutableCloneableVector { +pub trait MutableCloneableSlice { /// Copies as many elements from `src` as it can into `self` (the /// shorter of `self.len()` and `src.len()`). Returns the number /// of elements copied. @@ -826,7 +826,7 @@ pub trait MutableCloneableVector { /// # Example /// /// ```rust - /// use std::slice::MutableCloneableVector; + /// use std::slice::MutableCloneableSlice; /// /// let mut dst = [0i, 0, 0]; /// let src = [1i, 2]; @@ -841,7 +841,7 @@ pub trait MutableCloneableVector { fn copy_from(self, &[T]) -> uint; } -impl<'a, T:Clone> MutableCloneableVector for &'a mut [T] { +impl<'a, T:Clone> MutableCloneableSlice for &'a mut [T] { #[inline] fn copy_from(self, src: &[T]) -> uint { for (a, b) in self.mut_iter().zip(src.iter()) { @@ -1413,7 +1413,7 @@ pub unsafe fn pop_ptr(slice: &mut Slice) -> Option<*const T> { pub mod bytes { use collections::Collection; use ptr; - use slice::MutableVector; + use slice::MutableSlice; /// A trait for operations on mutable `[u8]`s. pub trait MutableByteVector { diff --git a/src/libcore/str.rs b/src/libcore/str.rs index c1166a7621e..99de772f3af 100644 --- a/src/libcore/str.rs +++ b/src/libcore/str.rs @@ -30,7 +30,7 @@ use num::{CheckedMul, Saturating}; use option::{Option, None, Some}; use raw::Repr; -use slice::ImmutableVector; +use slice::ImmutableSlice; use slice; use uint; @@ -964,7 +964,7 @@ pub mod raw { use collections::Collection; use ptr::RawPtr; use raw::Slice; - use slice::{ImmutableVector}; + use slice::{ImmutableSlice}; use str::{is_utf8, StrSlice}; /// Converts a slice of bytes to a string slice without checking diff --git a/src/libregex/vm.rs b/src/libregex/vm.rs index b37000df02d..118c2f7a3ce 100644 --- a/src/libregex/vm.rs +++ b/src/libregex/vm.rs @@ -35,7 +35,7 @@ use std::cmp; use std::mem; -use std::slice::MutableVector; +use std::slice::MutableSlice; use compile::{ Program, Match, OneChar, CharClass, Any, EmptyBegin, EmptyEnd, EmptyWordBoundary, diff --git a/src/librlibc/lib.rs b/src/librlibc/lib.rs index c7295125f42..706b5c33255 100644 --- a/src/librlibc/lib.rs +++ b/src/librlibc/lib.rs @@ -112,7 +112,7 @@ mod test { use core::iter::Iterator; use core::collections::Collection; use core::str::StrSlice; - use core::slice::{MutableVector, ImmutableVector}; + use core::slice::{MutableSlice, ImmutableSlice}; use super::{memcmp, memset, memcpy, memmove}; diff --git a/src/libstd/ascii.rs b/src/libstd/ascii.rs index e8352dcd40c..6e442a018a0 100644 --- a/src/libstd/ascii.rs +++ b/src/libstd/ascii.rs @@ -19,7 +19,7 @@ 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; diff --git a/src/libstd/collections/hashmap.rs b/src/libstd/collections/hashmap.rs index 2de9db1cc93..1bb92c487c6 100644 --- a/src/libstd/collections/hashmap.rs +++ b/src/libstd/collections/hashmap.rs @@ -2743,7 +2743,7 @@ mod test_set { use prelude::*; use super::HashSet; - use slice::ImmutableEqVector; + use slice::ImmutableEqSlice; use collections::Collection; #[test] diff --git a/src/libstd/dynamic_lib.rs b/src/libstd/dynamic_lib.rs index 1ac37458e24..f3bdd987122 100644 --- a/src/libstd/dynamic_lib.rs +++ b/src/libstd/dynamic_lib.rs @@ -29,7 +29,7 @@ use os; use path::{Path,GenericPath}; use result::*; -use slice::{Vector,ImmutableVector}; +use slice::{Vector,ImmutableSlice}; use str; use string::String; use vec::Vec; diff --git a/src/libstd/io/buffered.rs b/src/libstd/io/buffered.rs index 71ec5242118..a9b0b33c59a 100644 --- a/src/libstd/io/buffered.rs +++ b/src/libstd/io/buffered.rs @@ -19,7 +19,7 @@ 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; diff --git a/src/libstd/io/comm_adapters.rs b/src/libstd/io/comm_adapters.rs index cd5887b7add..53b5fbe3894 100644 --- a/src/libstd/io/comm_adapters.rs +++ b/src/libstd/io/comm_adapters.rs @@ -15,7 +15,7 @@ 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; diff --git a/src/libstd/io/extensions.rs b/src/libstd/io/extensions.rs index 5215aec5dfb..c40ea749376 100644 --- a/src/libstd/io/extensions.rs +++ b/src/libstd/io/extensions.rs @@ -21,7 +21,7 @@ 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(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); diff --git a/src/libstd/io/fs.rs b/src/libstd/io/fs.rs index 7335511ed85..f95f41509a0 100644 --- a/src/libstd/io/fs.rs +++ b/src/libstd/io/fs.rs @@ -70,7 +70,7 @@ use result::{Err, Ok}; use rt::rtio::LocalIo; use rt::rtio; -use slice::ImmutableVector; +use slice::ImmutableSlice; use string::String; use vec::Vec; diff --git a/src/libstd/io/mem.rs b/src/libstd/io/mem.rs index 8879f7e2506..e6866f45948 100644 --- a/src/libstd/io/mem.rs +++ b/src/libstd/io/mem.rs @@ -19,7 +19,7 @@ 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; diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs index d098f9a6479..fa21c108ea3 100644 --- a/src/libstd/io/mod.rs +++ b/src/libstd/io/mod.rs @@ -235,7 +235,7 @@ fn file_product(p: &Path) -> IoResult { 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; diff --git a/src/libstd/io/net/ip.rs b/src/libstd/io/net/ip.rs index 0f864c7be5e..ed76cdc276b 100644 --- a/src/libstd/io/net/ip.rs +++ b/src/libstd/io/net/ip.rs @@ -21,7 +21,7 @@ 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; diff --git a/src/libstd/io/net/tcp.rs b/src/libstd/io/net/tcp.rs index 0b0c22ed887..25ede848b88 100644 --- a/src/libstd/io/net/tcp.rs +++ b/src/libstd/io/net/tcp.rs @@ -21,7 +21,7 @@ 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; diff --git a/src/libstd/io/signal.rs b/src/libstd/io/signal.rs index c126866e715..0ef13df513f 100644 --- a/src/libstd/io/signal.rs +++ b/src/libstd/io/signal.rs @@ -30,7 +30,7 @@ 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 diff --git a/src/libstd/io/stdio.rs b/src/libstd/io/stdio.rs index 5b33c3671b4..fea161c426a 100644 --- a/src/libstd/io/stdio.rs +++ b/src/libstd/io/stdio.rs @@ -41,7 +41,7 @@ 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; diff --git a/src/libstd/num/i16.rs b/src/libstd/num/i16.rs index 9b97513935c..f5b2f31a127 100644 --- a/src/libstd/num/i16.rs +++ b/src/libstd/num/i16.rs @@ -17,7 +17,7 @@ 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}; diff --git a/src/libstd/num/i32.rs b/src/libstd/num/i32.rs index 03dcbb0f6d6..623a10725c8 100644 --- a/src/libstd/num/i32.rs +++ b/src/libstd/num/i32.rs @@ -17,7 +17,7 @@ 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}; diff --git a/src/libstd/num/i64.rs b/src/libstd/num/i64.rs index 347b5b4b93c..ffb1307908c 100644 --- a/src/libstd/num/i64.rs +++ b/src/libstd/num/i64.rs @@ -17,7 +17,7 @@ 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}; diff --git a/src/libstd/num/i8.rs b/src/libstd/num/i8.rs index fd6f96a0f97..4fbb7381238 100644 --- a/src/libstd/num/i8.rs +++ b/src/libstd/num/i8.rs @@ -17,7 +17,7 @@ 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}; diff --git a/src/libstd/num/int.rs b/src/libstd/num/int.rs index 1888d6a519e..7821306f5fc 100644 --- a/src/libstd/num/int.rs +++ b/src/libstd/num/int.rs @@ -17,7 +17,7 @@ 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}; diff --git a/src/libstd/num/strconv.rs b/src/libstd/num/strconv.rs index 37378518dc8..407c8ea61d9 100644 --- a/src/libstd/num/strconv.rs +++ b/src/libstd/num/strconv.rs @@ -20,7 +20,7 @@ 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; diff --git a/src/libstd/num/u16.rs b/src/libstd/num/u16.rs index 727d7561062..0f00f99e980 100644 --- a/src/libstd/num/u16.rs +++ b/src/libstd/num/u16.rs @@ -17,7 +17,7 @@ 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}; diff --git a/src/libstd/num/u32.rs b/src/libstd/num/u32.rs index d18bfdf9fba..e6c6bc377b7 100644 --- a/src/libstd/num/u32.rs +++ b/src/libstd/num/u32.rs @@ -17,7 +17,7 @@ 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}; diff --git a/src/libstd/num/u64.rs b/src/libstd/num/u64.rs index 53e88a96f33..7eb9e1a082f 100644 --- a/src/libstd/num/u64.rs +++ b/src/libstd/num/u64.rs @@ -17,7 +17,7 @@ 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}; diff --git a/src/libstd/num/u8.rs b/src/libstd/num/u8.rs index e6cbd14bf41..300dd3bcc01 100644 --- a/src/libstd/num/u8.rs +++ b/src/libstd/num/u8.rs @@ -17,7 +17,7 @@ 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}; diff --git a/src/libstd/num/uint.rs b/src/libstd/num/uint.rs index 41c4caf4006..0adc22e3214 100644 --- a/src/libstd/num/uint.rs +++ b/src/libstd/num/uint.rs @@ -17,7 +17,7 @@ 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}; diff --git a/src/libstd/os.rs b/src/libstd/os.rs index 85445e49139..0d604aab8ac 100644 --- a/src/libstd/os.rs +++ b/src/libstd/os.rs @@ -45,7 +45,7 @@ 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; diff --git a/src/libstd/path/mod.rs b/src/libstd/path/mod.rs index d290a5f8c63..087b3e4c53f 100644 --- a/src/libstd/path/mod.rs +++ b/src/libstd/path/mod.rs @@ -75,7 +75,7 @@ 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. diff --git a/src/libstd/path/posix.rs b/src/libstd/path/posix.rs index 9a4bc11f5c0..81abf3e7669 100644 --- a/src/libstd/path/posix.rs +++ b/src/libstd/path/posix.rs @@ -22,7 +22,7 @@ use str::Str; use str; use slice::{CloneableVector, Splits, Vector, VectorVector, - ImmutableEqVector, ImmutableVector}; + ImmutableEqSlice, ImmutableSlice}; use vec::Vec; use super::{BytesContainer, GenericPath, GenericPathUnsafe}; diff --git a/src/libstd/path/windows.rs b/src/libstd/path/windows.rs index c3a217bf940..ca8eae769bb 100644 --- a/src/libstd/path/windows.rs +++ b/src/libstd/path/windows.rs @@ -23,7 +23,7 @@ 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; diff --git a/src/libstd/prelude.rs b/src/libstd/prelude.rs index aa407ce8e0c..d5d24d17d86 100644 --- a/src/libstd/prelude.rs +++ b/src/libstd/prelude.rs @@ -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; diff --git a/src/libstd/rand/os.rs b/src/libstd/rand/os.rs index ffe8e539ffb..2be4129883f 100644 --- a/src/libstd/rand/os.rs +++ b/src/libstd/rand/os.rs @@ -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; diff --git a/src/libstd/rt/backtrace.rs b/src/libstd/rt/backtrace.rs index b86937e4213..a4491b2ab1d 100644 --- a/src/libstd/rt/backtrace.rs +++ b/src/libstd/rt/backtrace.rs @@ -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 @@ fn print(w: &mut Writer, idx: int, addr: *mut libc::c_void) -> IoResult<()> { 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; diff --git a/src/libunicode/normalize.rs b/src/libunicode/normalize.rs index ec31181e8a7..c5e1773dcff 100644 --- a/src/libunicode/normalize.rs +++ b/src/libunicode/normalize.rs @@ -15,7 +15,7 @@ use core::cmp::{Equal, Less, Greater}; use core::option::{Option, Some, None}; -use core::slice::ImmutableVector; +use core::slice::ImmutableSlice; use tables::normalization::{canonical_table, compatibility_table, composition_table}; fn bsearch_table(c: char, r: &'static [(char, &'static [T])]) -> Option<&'static [T]> { diff --git a/src/libunicode/tables.rs b/src/libunicode/tables.rs index 4332fc596c9..e58fe589557 100644 --- a/src/libunicode/tables.rs +++ b/src/libunicode/tables.rs @@ -14,7 +14,7 @@ fn bsearch_range_table(c: char, r: &'static [(char,char)]) -> bool { use core::cmp::{Equal, Less, Greater}; - use core::slice::ImmutableVector; + use core::slice::ImmutableSlice; use core::option::None; r.bsearch(|&(lo,hi)| { if lo <= c && c <= hi { Equal } @@ -6230,7 +6230,7 @@ pub mod normalization { fn bsearch_range_value_table(c: char, r: &'static [(char, char, u8)]) -> u8 { use core::option::{Some, None}; use core::cmp::{Equal, Less, Greater}; - use core::slice::ImmutableVector; + use core::slice::ImmutableSlice; match r.bsearch(|&(lo, hi, _)| { if lo <= c && c <= hi { Equal } else if hi < c { Less } @@ -6354,7 +6354,7 @@ pub fn canonical_combining_class(c: char) -> u8 { pub mod conversions { use core::cmp::{Equal, Less, Greater}; - use core::slice::ImmutableVector; + use core::slice::ImmutableSlice; use core::tuple::Tuple2; use core::option::{Option, Some, None}; @@ -6915,7 +6915,7 @@ fn bsearch_case_table(c: char, table: &'static [(char, char)]) -> Option { pub mod charwidth { use core::option::{Option, Some, None}; - use core::slice::ImmutableVector; + use core::slice::ImmutableSlice; fn bsearch_range_value_table(c: char, is_cjk: bool, r: &'static [(char, char, u8, u8)]) -> u8 { use core::cmp::{Equal, Less, Greater}; @@ -7113,7 +7113,7 @@ pub fn width(c: char, is_cjk: bool) -> Option { pub mod grapheme { use core::option::{Some, None}; - use core::slice::ImmutableVector; + use core::slice::ImmutableSlice; #[allow(non_camel_case_types)] #[deriving(Clone)] -- 2.44.0