diff options
| author | bors <bors@rust-lang.org> | 2015-01-14 04:42:01 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-01-14 04:42:01 +0000 |
| commit | 3614e1de6cf7abc7754c23f93476bef0e2625e99 (patch) | |
| tree | e36aa17f7450d9f0007d7278e244ba6d8127b5cf /src/libstd | |
| parent | 170c4399e614fe599c3d41306b3429ca8b3b68c6 (diff) | |
| parent | c1d48a85082cfe3683ad9eda5223d3259d4fa718 (diff) | |
| download | rust-3614e1de6cf7abc7754c23f93476bef0e2625e99.tar.gz rust-3614e1de6cf7abc7754c23f93476bef0e2625e99.zip | |
auto merge of #21061 : japaric/rust/range, r=nick29581
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/io/buffered.rs | 6 | ||||
| -rw-r--r-- | src/libstd/io/comm_adapters.rs | 2 | ||||
| -rw-r--r-- | src/libstd/io/fs.rs | 2 | ||||
| -rw-r--r-- | src/libstd/io/mem.rs | 10 | ||||
| -rw-r--r-- | src/libstd/io/mod.rs | 6 | ||||
| -rw-r--r-- | src/libstd/io/net/ip.rs | 2 | ||||
| -rw-r--r-- | src/libstd/io/util.rs | 6 | ||||
| -rw-r--r-- | src/libstd/path/mod.rs | 6 | ||||
| -rw-r--r-- | src/libstd/path/posix.rs | 6 | ||||
| -rw-r--r-- | src/libstd/path/windows.rs | 34 | ||||
| -rw-r--r-- | src/libstd/rt/unwind.rs | 2 | ||||
| -rw-r--r-- | src/libstd/rt/util.rs | 4 | ||||
| -rw-r--r-- | src/libstd/sys/windows/os.rs | 2 |
13 files changed, 44 insertions, 44 deletions
diff --git a/src/libstd/io/buffered.rs b/src/libstd/io/buffered.rs index 36def48b88b..60e2641ed8c 100644 --- a/src/libstd/io/buffered.rs +++ b/src/libstd/io/buffered.rs @@ -122,7 +122,7 @@ impl<R: Reader> Reader for BufferedReader<R> { let nread = { let available = try!(self.fill_buf()); let nread = cmp::min(available.len(), buf.len()); - slice::bytes::copy_memory(buf, &available[0..nread]); + slice::bytes::copy_memory(buf, &available[..nread]); nread }; self.pos += nread; @@ -183,7 +183,7 @@ impl<W: Writer> BufferedWriter<W> { fn flush_buf(&mut self) -> IoResult<()> { if self.pos != 0 { - let ret = self.inner.as_mut().unwrap().write(&self.buf[0..self.pos]); + let ret = self.inner.as_mut().unwrap().write(&self.buf[..self.pos]); self.pos = 0; ret } else { @@ -282,7 +282,7 @@ impl<W: Writer> Writer for LineBufferedWriter<W> { fn write(&mut self, buf: &[u8]) -> IoResult<()> { match buf.iter().rposition(|&b| b == b'\n') { Some(i) => { - try!(self.inner.write(&buf[0..(i + 1)])); + try!(self.inner.write(&buf[..(i + 1)])); try!(self.inner.flush()); try!(self.inner.write(&buf[(i + 1)..])); Ok(()) diff --git a/src/libstd/io/comm_adapters.rs b/src/libstd/io/comm_adapters.rs index b578f4d5adc..4b0014c68f7 100644 --- a/src/libstd/io/comm_adapters.rs +++ b/src/libstd/io/comm_adapters.rs @@ -90,7 +90,7 @@ impl Reader for ChanReader { Some(src) => { let dst = buf.slice_from_mut(num_read); let count = cmp::min(src.len(), dst.len()); - bytes::copy_memory(dst, &src[0..count]); + bytes::copy_memory(dst, &src[..count]); count }, None => 0, diff --git a/src/libstd/io/fs.rs b/src/libstd/io/fs.rs index dbccc81c4cc..64406d88253 100644 --- a/src/libstd/io/fs.rs +++ b/src/libstd/io/fs.rs @@ -889,7 +889,7 @@ mod test { let mut read_buf = [0; 1028]; let read_str = match check!(read_stream.read(&mut read_buf)) { -1|0 => panic!("shouldn't happen"), - n => str::from_utf8(&read_buf[0..n]).unwrap().to_string() + n => str::from_utf8(&read_buf[..n]).unwrap().to_string() }; assert_eq!(read_str.as_slice(), message); } diff --git a/src/libstd/io/mem.rs b/src/libstd/io/mem.rs index c5e289398e0..ee05a9e5596 100644 --- a/src/libstd/io/mem.rs +++ b/src/libstd/io/mem.rs @@ -204,7 +204,7 @@ impl<'a> Reader for &'a [u8] { let write_len = min(buf.len(), self.len()); { - let input = &self[0..write_len]; + let input = &self[..write_len]; let output = buf.slice_to_mut(write_len); slice::bytes::copy_memory(output, input); } @@ -286,7 +286,7 @@ impl<'a> Writer for BufWriter<'a> { Ok(()) } else { - slice::bytes::copy_memory(dst, &src[0..dst_len]); + slice::bytes::copy_memory(dst, &src[..dst_len]); self.pos += dst_len; @@ -498,7 +498,7 @@ mod test { assert_eq!(buf, b); assert_eq!(reader.read(&mut buf), Ok(3)); let b: &[_] = &[5, 6, 7]; - assert_eq!(&buf[0..3], b); + assert_eq!(&buf[..3], b); assert!(reader.read(&mut buf).is_err()); let mut reader = MemReader::new(vec!(0, 1, 2, 3, 4, 5, 6, 7)); assert_eq!(reader.read_until(3).unwrap(), vec!(0, 1, 2, 3)); @@ -524,7 +524,7 @@ mod test { assert_eq!(buf.as_slice(), b); assert_eq!(reader.read(&mut buf), Ok(3)); let b: &[_] = &[5, 6, 7]; - assert_eq!(&buf[0..3], b); + assert_eq!(&buf[..3], b); assert!(reader.read(&mut buf).is_err()); let mut reader = &mut in_buf.as_slice(); assert_eq!(reader.read_until(3).unwrap(), vec!(0, 1, 2, 3)); @@ -551,7 +551,7 @@ mod test { assert_eq!(buf, b); assert_eq!(reader.read(&mut buf), Ok(3)); let b: &[_] = &[5, 6, 7]; - assert_eq!(&buf[0..3], b); + assert_eq!(&buf[..3], b); assert!(reader.read(&mut buf).is_err()); let mut reader = BufReader::new(in_buf.as_slice()); assert_eq!(reader.read_until(3).unwrap(), vec!(0, 1, 2, 3)); diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs index 3968dda2a82..bab4dafd090 100644 --- a/src/libstd/io/mod.rs +++ b/src/libstd/io/mod.rs @@ -1069,7 +1069,7 @@ pub trait Writer { fn write_char(&mut self, c: char) -> IoResult<()> { let mut buf = [0u8; 4]; let n = c.encode_utf8(buf.as_mut_slice()).unwrap_or(0); - self.write(&buf[0..n]) + self.write(&buf[..n]) } /// Write the result of passing n through `int::to_str_bytes`. @@ -1454,7 +1454,7 @@ pub trait Buffer: Reader { }; match available.iter().position(|&b| b == byte) { Some(i) => { - res.push_all(&available[0..(i + 1)]); + res.push_all(&available[..(i + 1)]); used = i + 1; break } @@ -1493,7 +1493,7 @@ pub trait Buffer: Reader { } } } - match str::from_utf8(&buf[0..width]).ok() { + match str::from_utf8(&buf[..width]).ok() { Some(s) => Ok(s.char_at(0)), None => Err(standard_error(InvalidInput)) } diff --git a/src/libstd/io/net/ip.rs b/src/libstd/io/net/ip.rs index d09afea94dc..adc122ff447 100644 --- a/src/libstd/io/net/ip.rs +++ b/src/libstd/io/net/ip.rs @@ -313,7 +313,7 @@ impl<'a> Parser<'a> { let mut tail = [0u16; 8]; let (tail_size, _) = read_groups(self, &mut tail, 8 - head_size); - Some(ipv6_addr_from_head_tail(&head[0..head_size], &tail[0..tail_size])) + Some(ipv6_addr_from_head_tail(&head[..head_size], &tail[..tail_size])) } fn read_ipv6_addr(&mut self) -> Option<IpAddr> { diff --git a/src/libstd/io/util.rs b/src/libstd/io/util.rs index ac7fb3f9cdb..adfd88644cc 100644 --- a/src/libstd/io/util.rs +++ b/src/libstd/io/util.rs @@ -60,7 +60,7 @@ impl<R: Reader> Reader for LimitReader<R> { impl<R: Buffer> Buffer for LimitReader<R> { fn fill_buf<'a>(&'a mut self) -> io::IoResult<&'a [u8]> { let amt = try!(self.inner.fill_buf()); - let buf = &amt[0..cmp::min(amt.len(), self.limit)]; + let buf = &amt[..cmp::min(amt.len(), self.limit)]; if buf.len() == 0 { Err(io::standard_error(io::EndOfFile)) } else { @@ -223,7 +223,7 @@ impl<R: Reader, W: Writer> TeeReader<R, W> { impl<R: Reader, W: Writer> Reader for TeeReader<R, W> { fn read(&mut self, buf: &mut [u8]) -> io::IoResult<uint> { self.reader.read(buf).and_then(|len| { - self.writer.write(&mut buf[0..len]).map(|()| len) + self.writer.write(&mut buf[..len]).map(|()| len) }) } } @@ -237,7 +237,7 @@ pub fn copy<R: Reader, W: Writer>(r: &mut R, w: &mut W) -> io::IoResult<()> { Err(ref e) if e.kind == io::EndOfFile => return Ok(()), Err(e) => return Err(e), }; - try!(w.write(&buf[0..len])); + try!(w.write(&buf[..len])); } } diff --git a/src/libstd/path/mod.rs b/src/libstd/path/mod.rs index 1ec7b6b3edc..541f1e77140 100644 --- a/src/libstd/path/mod.rs +++ b/src/libstd/path/mod.rs @@ -352,7 +352,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe { match name.rposition_elem(&dot) { None | Some(0) => name, Some(1) if name == b".." => name, - Some(pos) => &name[0..pos] + Some(pos) => &name[..pos] } }) } @@ -475,7 +475,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe { let extlen = extension.container_as_bytes().len(); match (name.rposition_elem(&dot), extlen) { (None, 0) | (Some(0), 0) => None, - (Some(idx), 0) => Some(name[0..idx].to_vec()), + (Some(idx), 0) => Some(name[..idx].to_vec()), (idx, extlen) => { let idx = match idx { None | Some(0) => name.len(), @@ -484,7 +484,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe { let mut v; v = Vec::with_capacity(idx + extlen + 1); - v.push_all(&name[0..idx]); + v.push_all(&name[..idx]); v.push(dot); v.push_all(extension.container_as_bytes()); Some(v) diff --git a/src/libstd/path/posix.rs b/src/libstd/path/posix.rs index 293696d5cca..aab64639ab5 100644 --- a/src/libstd/path/posix.rs +++ b/src/libstd/path/posix.rs @@ -136,7 +136,7 @@ impl GenericPathUnsafe for Path { } Some(idx) => { let mut v = Vec::with_capacity(idx + 1 + filename.len()); - v.push_all(&self.repr[0..(idx+1)]); + v.push_all(&self.repr[..(idx+1)]); v.push_all(filename); // FIXME: this is slow self.repr = Path::normalize(v.as_slice()); @@ -177,9 +177,9 @@ impl GenericPath for Path { match self.sepidx { None if b".." == self.repr => self.repr.as_slice(), None => dot_static, - Some(0) => &self.repr[0..1], + Some(0) => &self.repr[..1], Some(idx) if &self.repr[(idx+1)..] == b".." => self.repr.as_slice(), - Some(idx) => &self.repr[0..idx] + Some(idx) => &self.repr[..idx] } } diff --git a/src/libstd/path/windows.rs b/src/libstd/path/windows.rs index 2a1f1794e49..3cff1c67be3 100644 --- a/src/libstd/path/windows.rs +++ b/src/libstd/path/windows.rs @@ -180,20 +180,20 @@ impl GenericPathUnsafe for Path { } Some((_,idxa,end)) if &self.repr[idxa..end] == ".." => { let mut s = String::with_capacity(end + 1 + filename.len()); - s.push_str(&self.repr[0..end]); + s.push_str(&self.repr[..end]); s.push(SEP); s.push_str(filename); self.update_normalized(&s[]); } Some((idxb,idxa,_)) if self.prefix == Some(DiskPrefix) && idxa == self.prefix_len() => { let mut s = String::with_capacity(idxb + filename.len()); - s.push_str(&self.repr[0..idxb]); + s.push_str(&self.repr[..idxb]); s.push_str(filename); self.update_normalized(&s[]); } Some((idxb,_,_)) => { let mut s = String::with_capacity(idxb + 1 + filename.len()); - s.push_str(&self.repr[0..idxb]); + s.push_str(&self.repr[..idxb]); s.push(SEP); s.push_str(filename); self.update_normalized(&s[]); @@ -350,13 +350,13 @@ impl GenericPath for Path { Some((idxb,_,end)) if &self.repr[idxb..end] == "\\" => { &self.repr[] } - Some((0,idxa,_)) => &self.repr[0..idxa], + Some((0,idxa,_)) => &self.repr[..idxa], Some((idxb,idxa,_)) => { match self.prefix { Some(DiskPrefix) | Some(VerbatimDiskPrefix) if idxb == self.prefix_len() => { - &self.repr[0..idxa] + &self.repr[..idxa] } - _ => &self.repr[0..idxb] + _ => &self.repr[..idxb] } } }) @@ -428,15 +428,15 @@ impl GenericPath for Path { if self.prefix.is_some() { Some(Path::new(match self.prefix { Some(DiskPrefix) if self.is_absolute() => { - &self.repr[0..(self.prefix_len()+1)] + &self.repr[..(self.prefix_len()+1)] } Some(VerbatimDiskPrefix) => { - &self.repr[0..(self.prefix_len()+1)] + &self.repr[..(self.prefix_len()+1)] } - _ => &self.repr[0..self.prefix_len()] + _ => &self.repr[..self.prefix_len()] })) } else if is_vol_relative(self) { - Some(Path::new(&self.repr[0..1])) + Some(Path::new(&self.repr[..1])) } else { None } @@ -683,7 +683,7 @@ impl Path { } (None, None) => true, (a, b) if a == b => { - &s_repr[0..self.prefix_len()] == &o_repr[0..other.prefix_len()] + &s_repr[..self.prefix_len()] == &o_repr[..other.prefix_len()] } _ => false } @@ -737,7 +737,7 @@ impl Path { match prefix.unwrap() { DiskPrefix => { let len = prefix_len(prefix) + is_abs as uint; - let mut s = String::from_str(&s[0..len]); + let mut s = String::from_str(&s[..len]); unsafe { let v = s.as_mut_vec(); v[0] = (*v)[0].to_ascii_uppercase(); @@ -752,7 +752,7 @@ impl Path { } VerbatimDiskPrefix => { let len = prefix_len(prefix) + is_abs as uint; - let mut s = String::from_str(&s[0..len]); + let mut s = String::from_str(&s[..len]); unsafe { let v = s.as_mut_vec(); v[4] = (*v)[4].to_ascii_uppercase(); @@ -762,14 +762,14 @@ impl Path { _ => { let plen = prefix_len(prefix); if s.len() > plen { - Some(String::from_str(&s[0..plen])) + Some(String::from_str(&s[..plen])) } else { None } } } } else if is_abs && comps.is_empty() { Some(repeat(SEP).take(1).collect()) } else { - let prefix_ = &s[0..prefix_len(prefix)]; + let prefix_ = &s[..prefix_len(prefix)]; let n = prefix_.len() + if is_abs { comps.len() } else { comps.len() - 1} + comps.iter().map(|v| v.len()).sum(); @@ -780,7 +780,7 @@ impl Path { s.push(':'); } Some(VerbatimDiskPrefix) => { - s.push_str(&prefix_[0..4]); + s.push_str(&prefix_[..4]); s.push(prefix_.as_bytes()[4].to_ascii_uppercase() as char); s.push_str(&prefix_[5..]); } @@ -813,7 +813,7 @@ impl Path { fn update_sepidx(&mut self) { let s = if self.has_nonsemantic_trailing_slash() { - &self.repr[0..(self.repr.len()-1)] + &self.repr[..(self.repr.len()-1)] } else { &self.repr[] }; let sep_test: fn(char) -> bool = if !prefix_is_verbatim(self.prefix) { is_sep diff --git a/src/libstd/rt/unwind.rs b/src/libstd/rt/unwind.rs index 6326e4c08f1..73b8f104c23 100644 --- a/src/libstd/rt/unwind.rs +++ b/src/libstd/rt/unwind.rs @@ -544,7 +544,7 @@ fn begin_unwind_inner(msg: Box<Any + Send>, file_line: &(&'static str, uint)) -> // MAX_CALLBACKS, so we're sure to clamp it as necessary. let callbacks = { let amt = CALLBACK_CNT.load(Ordering::SeqCst); - &CALLBACKS[0..cmp::min(amt, MAX_CALLBACKS)] + &CALLBACKS[..cmp::min(amt, MAX_CALLBACKS)] }; for cb in callbacks.iter() { match cb.load(Ordering::SeqCst) { diff --git a/src/libstd/rt/util.rs b/src/libstd/rt/util.rs index 83f646d89dc..235cedcda52 100644 --- a/src/libstd/rt/util.rs +++ b/src/libstd/rt/util.rs @@ -131,7 +131,7 @@ pub fn abort(args: fmt::Arguments) -> ! { impl<'a> fmt::Writer for BufWriter<'a> { fn write_str(&mut self, bytes: &str) -> fmt::Result { let left = self.buf.slice_from_mut(self.pos); - let to_write = &bytes.as_bytes()[0..cmp::min(bytes.len(), left.len())]; + let to_write = &bytes.as_bytes()[..cmp::min(bytes.len(), left.len())]; slice::bytes::copy_memory(left, to_write); self.pos += to_write.len(); Ok(()) @@ -142,7 +142,7 @@ pub fn abort(args: fmt::Arguments) -> ! { let mut msg = [0u8; 512]; let mut w = BufWriter { buf: &mut msg, pos: 0 }; let _ = write!(&mut w, "{}", args); - let msg = str::from_utf8(&w.buf[0..w.pos]).unwrap_or("aborted"); + let msg = str::from_utf8(&w.buf[..w.pos]).unwrap_or("aborted"); let msg = if msg.is_empty() {"aborted"} else {msg}; rterrln!("fatal runtime error: {}", msg); unsafe { intrinsics::abort(); } diff --git a/src/libstd/sys/windows/os.rs b/src/libstd/sys/windows/os.rs index 064633f321c..4540068133b 100644 --- a/src/libstd/sys/windows/os.rs +++ b/src/libstd/sys/windows/os.rs @@ -36,7 +36,7 @@ const BUF_BYTES : uint = 2048u; pub fn truncate_utf16_at_nul<'a>(v: &'a [u16]) -> &'a [u16] { match v.iter().position(|c| *c == 0) { // don't include the 0 - Some(i) => &v[0..i], + Some(i) => &v[..i], None => v } } |
