diff options
| author | bors <bors@rust-lang.org> | 2015-01-29 05:47:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-01-29 05:47:21 +0000 |
| commit | bedd8108dc9b79402d1ea5349d766275f73398ff (patch) | |
| tree | 33580f180481d78ead16c7a8d3af4513968f4007 /src/libstd | |
| parent | c5961ad06d45689b44ff305c15d6ec7ec65755a9 (diff) | |
| parent | bce81e24647507c82e02e9918f54e8e3a2431149 (diff) | |
| download | rust-bedd8108dc9b79402d1ea5349d766275f73398ff.tar.gz rust-bedd8108dc9b79402d1ea5349d766275f73398ff.zip | |
Auto merge of #21680 - japaric:slice, r=alexcrichton
Replaces `slice_*` method calls with slicing syntax, and removes `as_slice()` calls that are redundant due to `Deref`.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/old_io/fs.rs | 6 | ||||
| -rw-r--r-- | src/libstd/old_io/mem.rs | 2 | ||||
| -rw-r--r-- | src/libstd/old_io/net/udp.rs | 2 | ||||
| -rw-r--r-- | src/libstd/path/posix.rs | 4 | ||||
| -rw-r--r-- | src/libstd/rand/reader.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sys/common/backtrace.rs | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/src/libstd/old_io/fs.rs b/src/libstd/old_io/fs.rs index a1ac5d2eab0..5a4ce24be0d 100644 --- a/src/libstd/old_io/fs.rs +++ b/src/libstd/old_io/fs.rs @@ -936,11 +936,11 @@ mod test { { let mut read_stream = File::open_mode(filename, Open, Read); { - let read_buf = read_mem.slice_mut(0, 4); + let read_buf = &mut read_mem[0..4]; check!(read_stream.read(read_buf)); } { - let read_buf = read_mem.slice_mut(4, 8); + let read_buf = &mut read_mem[4..8]; check!(read_stream.read(read_buf)); } } @@ -971,7 +971,7 @@ mod test { } check!(unlink(filename)); let read_str = str::from_utf8(&read_mem).unwrap(); - assert_eq!(read_str, message.slice(4, 8)); + assert_eq!(read_str, &message[4..8]); assert_eq!(tell_pos_pre_read, set_cursor); assert_eq!(tell_pos_post_read, message.len() as u64); } diff --git a/src/libstd/old_io/mem.rs b/src/libstd/old_io/mem.rs index 254daf3202a..750bc50288a 100644 --- a/src/libstd/old_io/mem.rs +++ b/src/libstd/old_io/mem.rs @@ -647,7 +647,7 @@ mod test { assert!(r.read_at_least(buf.len(), &mut buf).is_ok()); let b: &[_] = &[1, 2, 3]; assert_eq!(buf, b); - assert!(r.read_at_least(0, buf.slice_to_mut(0)).is_ok()); + assert!(r.read_at_least(0, &mut buf[..0]).is_ok()); assert_eq!(buf, b); assert!(r.read_at_least(buf.len(), &mut buf).is_ok()); let b: &[_] = &[4, 5, 6]; diff --git a/src/libstd/old_io/net/udp.rs b/src/libstd/old_io/net/udp.rs index 9055a089eec..de0752b3619 100644 --- a/src/libstd/old_io/net/udp.rs +++ b/src/libstd/old_io/net/udp.rs @@ -47,7 +47,7 @@ use sys_common; /// match socket.recv_from(&mut buf) { /// Ok((amt, src)) => { /// // Send a reply to the socket we received data from -/// let buf = buf.slice_to_mut(amt); +/// let buf = &mut buf[..amt]; /// buf.reverse(); /// socket.send_to(buf, src); /// } diff --git a/src/libstd/path/posix.rs b/src/libstd/path/posix.rs index 39138e14803..588f724134e 100644 --- a/src/libstd/path/posix.rs +++ b/src/libstd/path/posix.rs @@ -109,7 +109,7 @@ impl GenericPathUnsafe for Path { unsafe fn new_unchecked<T: BytesContainer>(path: T) -> Path { let path = Path::normalize(path.container_as_bytes()); assert!(!path.is_empty()); - let idx = path.as_slice().rposition_elem(&SEP_BYTE); + let idx = path.rposition_elem(&SEP_BYTE); Path{ repr: path, sepidx: idx } } @@ -290,7 +290,7 @@ impl GenericPath for Path { } } } - Some(Path::new(comps.as_slice().connect(&SEP_BYTE))) + Some(Path::new(comps.connect(&SEP_BYTE))) } } diff --git a/src/libstd/rand/reader.rs b/src/libstd/rand/reader.rs index afacfeeaa30..b71e8b4fd61 100644 --- a/src/libstd/rand/reader.rs +++ b/src/libstd/rand/reader.rs @@ -107,7 +107,7 @@ mod test { let v = [1u8, 2, 3, 4, 5, 6, 7, 8]; let mut w = [0u8; 8]; - let mut rng = ReaderRng::new(MemReader::new(v.as_slice().to_vec())); + let mut rng = ReaderRng::new(MemReader::new(v.to_vec())); rng.fill_bytes(&mut w); assert!(v == w); diff --git a/src/libstd/sys/common/backtrace.rs b/src/libstd/sys/common/backtrace.rs index 9b53ebf70a0..c3e12586829 100644 --- a/src/libstd/sys/common/backtrace.rs +++ b/src/libstd/sys/common/backtrace.rs @@ -94,7 +94,7 @@ pub fn demangle(writer: &mut Writer, s: &str) -> IoResult<()> { ($($pat:expr, => $demangled:expr),*) => ({ $(if rest.starts_with($pat) { try!(writer.write_str($demangled)); - rest = rest.slice_from($pat.len()); + rest = &rest[$pat.len()..]; } else)* { try!(writer.write_str(rest)); |
