about summary refs log tree commit diff
path: root/src/libstd/path
diff options
context:
space:
mode:
authorDaniel Micay <danielmicay@gmail.com>2014-03-08 18:11:52 -0500
committerDaniel Micay <danielmicay@gmail.com>2014-03-20 01:30:27 -0400
commitce620320a20baa1428e679c751b1b4a8d8556ca1 (patch)
treef28a0234fe5f1d9509ef6cfa0c92448f7f29f7ec /src/libstd/path
parent4ca51aeea7187a63b987129d67cf7d348b6c60a9 (diff)
downloadrust-ce620320a20baa1428e679c751b1b4a8d8556ca1.tar.gz
rust-ce620320a20baa1428e679c751b1b4a8d8556ca1.zip
rename std::vec -> std::slice
Closes #12702
Diffstat (limited to 'src/libstd/path')
-rw-r--r--src/libstd/path/mod.rs10
-rw-r--r--src/libstd/path/posix.rs16
-rw-r--r--src/libstd/path/windows.rs2
3 files changed, 14 insertions, 14 deletions
diff --git a/src/libstd/path/mod.rs b/src/libstd/path/mod.rs
index 09124f63361..c8465eb039f 100644
--- a/src/libstd/path/mod.rs
+++ b/src/libstd/path/mod.rs
@@ -71,9 +71,9 @@ use iter::Iterator;
 use option::{Option, None, Some};
 use str;
 use str::{MaybeOwned, OwnedStr, Str, StrSlice, from_utf8_lossy};
-use vec;
-use vec::{CloneableVector, OwnedCloneableVector, OwnedVector, Vector};
-use vec::{ImmutableEqVector, ImmutableVector};
+use slice;
+use slice::{CloneableVector, OwnedCloneableVector, OwnedVector, Vector};
+use slice::{ImmutableEqVector, ImmutableVector};
 
 /// Typedef for POSIX file paths.
 /// See `posix::Path` for more info.
@@ -300,7 +300,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe {
                             } else {
                                 let mut v;
                                 let extension = extension.container_as_bytes();
-                                v = vec::with_capacity(name.len() + extension.len() + 1);
+                                v = slice::with_capacity(name.len() + extension.len() + 1);
                                 v.push_all(name);
                                 v.push(dot);
                                 v.push_all(extension);
@@ -313,7 +313,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe {
                             } else {
                                 let mut v;
                                 let extension = extension.container_as_bytes();
-                                v = vec::with_capacity(idx + extension.len() + 1);
+                                v = slice::with_capacity(idx + extension.len() + 1);
                                 v.push_all(name.slice_to(idx+1));
                                 v.push_all(extension);
                                 Some(v)
diff --git a/src/libstd/path/posix.rs b/src/libstd/path/posix.rs
index 8345a2d04d1..f654f59266a 100644
--- a/src/libstd/path/posix.rs
+++ b/src/libstd/path/posix.rs
@@ -20,9 +20,9 @@ use iter::{AdditiveIterator, Extendable, Iterator, Map};
 use option::{Option, None, Some};
 use str;
 use str::Str;
-use vec;
-use vec::{CloneableVector, RevSplits, Splits, Vector, VectorVector,
-          ImmutableEqVector, OwnedVector, ImmutableVector, OwnedCloneableVector};
+use slice;
+use slice::{CloneableVector, RevSplits, Splits, Vector, VectorVector,
+            ImmutableEqVector, OwnedVector, ImmutableVector, OwnedCloneableVector};
 use super::{BytesContainer, GenericPath, GenericPathUnsafe};
 
 /// Iterator that yields successive components of a Path as &[u8]
@@ -125,7 +125,7 @@ impl GenericPathUnsafe for Path {
         let filename = filename.container_as_bytes();
         match self.sepidx {
             None if bytes!("..") == self.repr => {
-                let mut v = vec::with_capacity(3 + filename.len());
+                let mut v = slice::with_capacity(3 + filename.len());
                 v.push_all(dot_dot_static);
                 v.push(SEP_BYTE);
                 v.push_all(filename);
@@ -135,14 +135,14 @@ impl GenericPathUnsafe for Path {
                 self.repr = Path::normalize(filename);
             }
             Some(idx) if self.repr.slice_from(idx+1) == bytes!("..") => {
-                let mut v = vec::with_capacity(self.repr.len() + 1 + filename.len());
+                let mut v = slice::with_capacity(self.repr.len() + 1 + filename.len());
                 v.push_all(self.repr);
                 v.push(SEP_BYTE);
                 v.push_all(filename);
                 self.repr = Path::normalize(v);
             }
             Some(idx) => {
-                let mut v = vec::with_capacity(idx + 1 + filename.len());
+                let mut v = slice::with_capacity(idx + 1 + filename.len());
                 v.push_all(self.repr.slice_to(idx+1));
                 v.push_all(filename);
                 self.repr = Path::normalize(v);
@@ -157,7 +157,7 @@ impl GenericPathUnsafe for Path {
             if path[0] == SEP_BYTE {
                 self.repr = Path::normalize(path);
             }  else {
-                let mut v = vec::with_capacity(self.repr.len() + path.len() + 1);
+                let mut v = slice::with_capacity(self.repr.len() + path.len() + 1);
                 v.push_all(self.repr);
                 v.push(SEP_BYTE);
                 v.push_all(path);
@@ -346,7 +346,7 @@ impl Path {
                     } else {
                         let n = if is_abs { comps.len() } else { comps.len() - 1} +
                                 comps.iter().map(|v| v.len()).sum();
-                        let mut v = vec::with_capacity(n);
+                        let mut v = slice::with_capacity(n);
                         let mut it = comps.move_iter();
                         if !is_abs {
                             match it.next() {
diff --git a/src/libstd/path/windows.rs b/src/libstd/path/windows.rs
index 180078ae959..dba8af4128b 100644
--- a/src/libstd/path/windows.rs
+++ b/src/libstd/path/windows.rs
@@ -22,7 +22,7 @@ use iter::{AdditiveIterator, DoubleEndedIterator, Extendable, Rev, Iterator, Map
 use option::{Option, Some, None};
 use str;
 use str::{CharSplits, OwnedStr, Str, StrVector, StrSlice};
-use vec::{Vector, OwnedVector, ImmutableVector};
+use slice::{Vector, OwnedVector, ImmutableVector};
 use super::{contains_nul, BytesContainer, GenericPath, GenericPathUnsafe};
 
 /// Iterator that yields successive components of a Path as &str