diff options
| author | Jorge Aparicio <japaricious@gmail.com> | 2015-02-01 21:53:25 -0500 |
|---|---|---|
| committer | Jorge Aparicio <japaricious@gmail.com> | 2015-02-05 13:45:01 -0500 |
| commit | 17bc7d8d5be3be9674d702ccad2fa88c487d23b0 (patch) | |
| tree | 325defba0f55b48273cd3f0814fe6c083dee5d41 /src/libstd/old_path | |
| parent | 2c05354211b04a52cc66a0b8ad8b2225eaf9e972 (diff) | |
| download | rust-17bc7d8d5be3be9674d702ccad2fa88c487d23b0.tar.gz rust-17bc7d8d5be3be9674d702ccad2fa88c487d23b0.zip | |
cleanup: replace `as[_mut]_slice()` calls with deref coercions
Diffstat (limited to 'src/libstd/old_path')
| -rw-r--r-- | src/libstd/old_path/posix.rs | 26 | ||||
| -rw-r--r-- | src/libstd/old_path/windows.rs | 4 |
2 files changed, 15 insertions, 15 deletions
diff --git a/src/libstd/old_path/posix.rs b/src/libstd/old_path/posix.rs index 8bcdd89623d..6bf2a30b7b1 100644 --- a/src/libstd/old_path/posix.rs +++ b/src/libstd/old_path/posix.rs @@ -131,25 +131,25 @@ impl GenericPathUnsafe for Path { v.push(SEP_BYTE); v.push_all(filename); // FIXME: this is slow - self.repr = Path::normalize(v.as_slice()); + self.repr = Path::normalize(&v); } None => { self.repr = Path::normalize(filename); } Some(idx) if &self.repr[idx+1..] == b".." => { let mut v = Vec::with_capacity(self.repr.len() + 1 + filename.len()); - v.push_all(self.repr.as_slice()); + v.push_all(&self.repr); v.push(SEP_BYTE); v.push_all(filename); // FIXME: this is slow - self.repr = Path::normalize(v.as_slice()); + self.repr = Path::normalize(&v); } Some(idx) => { let mut v = Vec::with_capacity(idx + 1 + filename.len()); v.push_all(&self.repr[..idx+1]); v.push_all(filename); // FIXME: this is slow - self.repr = Path::normalize(v.as_slice()); + self.repr = Path::normalize(&v); } } self.sepidx = self.repr.rposition_elem(&SEP_BYTE); @@ -162,11 +162,11 @@ impl GenericPathUnsafe for Path { self.repr = Path::normalize(path); } else { let mut v = Vec::with_capacity(self.repr.len() + path.len() + 1); - v.push_all(self.repr.as_slice()); + v.push_all(&self.repr); v.push(SEP_BYTE); v.push_all(path); // FIXME: this is slow - self.repr = Path::normalize(v.as_slice()); + self.repr = Path::normalize(&v); } self.sepidx = self.repr.rposition_elem(&SEP_BYTE); } @@ -176,7 +176,7 @@ impl GenericPathUnsafe for Path { impl GenericPath for Path { #[inline] fn as_vec<'a>(&'a self) -> &'a [u8] { - self.repr.as_slice() + &self.repr } fn into_vec(self) -> Vec<u8> { @@ -185,10 +185,10 @@ impl GenericPath for Path { fn dirname<'a>(&'a self) -> &'a [u8] { match self.sepidx { - None if b".." == self.repr => self.repr.as_slice(), + None if b".." == self.repr => &self.repr, None => dot_static, Some(0) => &self.repr[..1], - Some(idx) if &self.repr[idx+1..] == b".." => self.repr.as_slice(), + Some(idx) if &self.repr[idx+1..] == b".." => &self.repr, Some(idx) => &self.repr[..idx] } } @@ -197,7 +197,7 @@ impl GenericPath for Path { match self.sepidx { None if b"." == self.repr || b".." == self.repr => None, - None => Some(self.repr.as_slice()), + None => Some(&self.repr), Some(idx) if &self.repr[idx+1..] == b".." => None, Some(0) if self.repr[1..].is_empty() => None, Some(idx) => Some(&self.repr[idx+1..]) @@ -382,7 +382,7 @@ impl Path { pub fn components<'a>(&'a self) -> Components<'a> { let v = if self.repr[0] == SEP_BYTE { &self.repr[1..] - } else { self.repr.as_slice() }; + } else { &*self.repr }; let is_sep_byte: fn(&u8) -> bool = is_sep_byte; // coerce to fn ptr let mut ret = v.split(is_sep_byte); if v.is_empty() { @@ -557,14 +557,14 @@ mod tests { { let path = Path::new($path); let mo = path.display().as_cow(); - assert_eq!(mo.as_slice(), $exp); + assert_eq!(mo, $exp); } ); ($path:expr, $exp:expr, filename) => ( { let path = Path::new($path); let mo = path.filename_display().as_cow(); - assert_eq!(mo.as_slice(), $exp); + assert_eq!(mo, $exp); } ) } diff --git a/src/libstd/old_path/windows.rs b/src/libstd/old_path/windows.rs index 2e25403220d..54c070e1b7d 100644 --- a/src/libstd/old_path/windows.rs +++ b/src/libstd/old_path/windows.rs @@ -1337,10 +1337,10 @@ mod tests { let path = Path::new("foo"); let mo = path.display().as_cow(); - assert_eq!(mo.as_slice(), "foo"); + assert_eq!(mo, "foo"); let path = Path::new(b"\\"); let mo = path.filename_display().as_cow(); - assert_eq!(mo.as_slice(), ""); + assert_eq!(mo, ""); } #[test] |
