Skip to content

Commit 3614e1d

Browse files
committed
auto merge of #21061 : japaric/rust/range, r=nick29581
2 parents 170c439 + c1d48a8 commit 3614e1d

File tree

44 files changed

+104
-105
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+104
-105
lines changed

src/libcollections/slice.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -1631,7 +1631,7 @@ mod tests {
16311631
#[test]
16321632
fn test_slice_from() {
16331633
let vec: &[int] = &[1, 2, 3, 4];
1634-
assert_eq!(&vec[0..], vec);
1634+
assert_eq!(&vec[], vec);
16351635
let b: &[int] = &[3, 4];
16361636
assert_eq!(&vec[2..], b);
16371637
let b: &[int] = &[];
@@ -1641,11 +1641,11 @@ mod tests {
16411641
#[test]
16421642
fn test_slice_to() {
16431643
let vec: &[int] = &[1, 2, 3, 4];
1644-
assert_eq!(&vec[0..4], vec);
1644+
assert_eq!(&vec[..4], vec);
16451645
let b: &[int] = &[1, 2];
1646-
assert_eq!(&vec[0..2], b);
1646+
assert_eq!(&vec[..2], b);
16471647
let b: &[int] = &[];
1648-
assert_eq!(&vec[0..0], b);
1648+
assert_eq!(&vec[..0], b);
16491649
}
16501650

16511651

@@ -2538,15 +2538,15 @@ mod tests {
25382538
let (left, right) = values.split_at_mut(2);
25392539
{
25402540
let left: &[_] = left;
2541-
assert!(left[0..left.len()] == [1, 2][]);
2541+
assert!(left[..left.len()] == [1, 2][]);
25422542
}
25432543
for p in left.iter_mut() {
25442544
*p += 1;
25452545
}
25462546

25472547
{
25482548
let right: &[_] = right;
2549-
assert!(right[0..right.len()] == [3, 4, 5][]);
2549+
assert!(right[..right.len()] == [3, 4, 5][]);
25502550
}
25512551
for p in right.iter_mut() {
25522552
*p += 2;

src/libcollections/str.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -807,7 +807,7 @@ pub trait StrExt: Index<FullRange, Output = str> {
807807
/// out of bounds.
808808
///
809809
/// See also `slice`, `slice_from` and `slice_chars`.
810-
#[unstable = "use slice notation [0..a] instead"]
810+
#[unstable = "use slice notation [..a] instead"]
811811
fn slice_to(&self, end: uint) -> &str {
812812
core_str::StrExt::slice_to(&self[], end)
813813
}

src/libcollections/string.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ impl String {
168168

169169
if i > 0 {
170170
unsafe {
171-
res.as_mut_vec().push_all(&v[0..i])
171+
res.as_mut_vec().push_all(&v[..i])
172172
};
173173
}
174174

src/libcore/fmt/float.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -332,5 +332,5 @@ pub fn float_to_str_bytes_common<T: Float, U, F>(
332332
}
333333
}
334334

335-
f(unsafe { str::from_utf8_unchecked(&buf[0..end]) })
335+
f(unsafe { str::from_utf8_unchecked(&buf[..end]) })
336336
}

src/libcore/fmt/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ impl<'a> Formatter<'a> {
449449
for c in sign.into_iter() {
450450
let mut b = [0; 4];
451451
let n = c.encode_utf8(&mut b).unwrap_or(0);
452-
let b = unsafe { str::from_utf8_unchecked(&b[0..n]) };
452+
let b = unsafe { str::from_utf8_unchecked(&b[..n]) };
453453
try!(f.buf.write_str(b));
454454
}
455455
if prefixed { f.buf.write_str(prefix) }
@@ -692,7 +692,7 @@ impl String for char {
692692
fn fmt(&self, f: &mut Formatter) -> Result {
693693
let mut utf8 = [0u8; 4];
694694
let amt = self.encode_utf8(&mut utf8).unwrap_or(0);
695-
let s: &str = unsafe { mem::transmute(&utf8[0..amt]) };
695+
let s: &str = unsafe { mem::transmute(&utf8[..amt]) };
696696
String::fmt(s, f)
697697
}
698698
}

src/libcore/slice.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ impl<T> SliceExt for [T] {
159159

160160
#[inline]
161161
fn split_at(&self, mid: uint) -> (&[T], &[T]) {
162-
(&self[0..mid], &self[mid..])
162+
(&self[..mid], &self[mid..])
163163
}
164164

165165
#[inline]
@@ -240,7 +240,7 @@ impl<T> SliceExt for [T] {
240240

241241
#[inline]
242242
fn init(&self) -> &[T] {
243-
&self[0..(self.len() - 1)]
243+
&self[..(self.len() - 1)]
244244
}
245245

246246
#[inline]
@@ -443,7 +443,7 @@ impl<T> SliceExt for [T] {
443443
#[inline]
444444
fn starts_with(&self, needle: &[T]) -> bool where T: PartialEq {
445445
let n = needle.len();
446-
self.len() >= n && needle == &self[0..n]
446+
self.len() >= n && needle == &self[..n]
447447
}
448448

449449
#[inline]
@@ -972,7 +972,7 @@ impl<'a, T, P> Iterator for Split<'a, T, P> where P: FnMut(&T) -> bool {
972972
match self.v.iter().position(|x| (self.pred)(x)) {
973973
None => self.finish(),
974974
Some(idx) => {
975-
let ret = Some(&self.v[0..idx]);
975+
let ret = Some(&self.v[..idx]);
976976
self.v = &self.v[(idx + 1)..];
977977
ret
978978
}
@@ -999,7 +999,7 @@ impl<'a, T, P> DoubleEndedIterator for Split<'a, T, P> where P: FnMut(&T) -> boo
999999
None => self.finish(),
10001000
Some(idx) => {
10011001
let ret = Some(&self.v[(idx + 1)..]);
1002-
self.v = &self.v[0..idx];
1002+
self.v = &self.v[..idx];
10031003
ret
10041004
}
10051005
}
@@ -1195,7 +1195,7 @@ impl<'a, T> Iterator for Windows<'a, T> {
11951195
if self.size > self.v.len() {
11961196
None
11971197
} else {
1198-
let ret = Some(&self.v[0..self.size]);
1198+
let ret = Some(&self.v[..self.size]);
11991199
self.v = &self.v[1..];
12001200
ret
12011201
}

src/libcore/str/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -701,10 +701,10 @@ impl TwoWaySearcher {
701701
//
702702
// What's going on is we have some critical factorization (u, v) of the
703703
// needle, and we want to determine whether u is a suffix of
704-
// &v[0..period]. If it is, we use "Algorithm CP1". Otherwise we use
704+
// &v[..period]. If it is, we use "Algorithm CP1". Otherwise we use
705705
// "Algorithm CP2", which is optimized for when the period of the needle
706706
// is large.
707-
if &needle[0..crit_pos] == &needle[period.. period + crit_pos] {
707+
if &needle[..crit_pos] == &needle[period.. period + crit_pos] {
708708
TwoWaySearcher {
709709
crit_pos: crit_pos,
710710
period: period,
@@ -1412,7 +1412,7 @@ impl StrExt for str {
14121412
#[inline]
14131413
fn starts_with(&self, needle: &str) -> bool {
14141414
let n = needle.len();
1415-
self.len() >= n && needle.as_bytes() == &self.as_bytes()[0..n]
1415+
self.len() >= n && needle.as_bytes() == &self.as_bytes()[..n]
14161416
}
14171417

14181418
#[inline]

src/libcoretest/char.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ fn test_encode_utf8() {
167167
fn check(input: char, expect: &[u8]) {
168168
let mut buf = [0u8; 4];
169169
let n = input.encode_utf8(buf.as_mut_slice()).unwrap_or(0);
170-
assert_eq!(&buf[0..n], expect);
170+
assert_eq!(&buf[..n], expect);
171171
}
172172

173173
check('x', &[0x78]);
@@ -181,7 +181,7 @@ fn test_encode_utf16() {
181181
fn check(input: char, expect: &[u16]) {
182182
let mut buf = [0u16; 2];
183183
let n = input.encode_utf16(buf.as_mut_slice()).unwrap_or(0);
184-
assert_eq!(&buf[0..n], expect);
184+
assert_eq!(&buf[..n], expect);
185185
}
186186

187187
check('x', &[0x0078]);

src/libcoretest/iter.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -288,39 +288,39 @@ fn test_iterator_len() {
288288
let v: &[_] = &[0i, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
289289
assert_eq!(v[..4].iter().count(), 4);
290290
assert_eq!(v[..10].iter().count(), 10);
291-
assert_eq!(v[0..0].iter().count(), 0);
291+
assert_eq!(v[..0].iter().count(), 0);
292292
}
293293

294294
#[test]
295295
fn test_iterator_sum() {
296296
let v: &[_] = &[0i, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
297297
assert_eq!(v[..4].iter().map(|&x| x).sum(), 6);
298298
assert_eq!(v.iter().map(|&x| x).sum(), 55);
299-
assert_eq!(v[0..0].iter().map(|&x| x).sum(), 0);
299+
assert_eq!(v[..0].iter().map(|&x| x).sum(), 0);
300300
}
301301

302302
#[test]
303303
fn test_iterator_product() {
304304
let v: &[_] = &[0i, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
305-
assert_eq!(v[0..4].iter().map(|&x| x).product(), 0);
305+
assert_eq!(v[..4].iter().map(|&x| x).product(), 0);
306306
assert_eq!(v[1..5].iter().map(|&x| x).product(), 24);
307-
assert_eq!(v[0..0].iter().map(|&x| x).product(), 1);
307+
assert_eq!(v[..0].iter().map(|&x| x).product(), 1);
308308
}
309309

310310
#[test]
311311
fn test_iterator_max() {
312312
let v: &[_] = &[0i, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
313-
assert_eq!(v[0..4].iter().map(|&x| x).max(), Some(3));
313+
assert_eq!(v[..4].iter().map(|&x| x).max(), Some(3));
314314
assert_eq!(v.iter().map(|&x| x).max(), Some(10));
315-
assert_eq!(v[0..0].iter().map(|&x| x).max(), None);
315+
assert_eq!(v[..0].iter().map(|&x| x).max(), None);
316316
}
317317

318318
#[test]
319319
fn test_iterator_min() {
320320
let v: &[_] = &[0i, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
321-
assert_eq!(v[0..4].iter().map(|&x| x).min(), Some(0));
321+
assert_eq!(v[..4].iter().map(|&x| x).min(), Some(0));
322322
assert_eq!(v.iter().map(|&x| x).min(), Some(0));
323-
assert_eq!(v[0..0].iter().map(|&x| x).min(), None);
323+
assert_eq!(v[..0].iter().map(|&x| x).min(), None);
324324
}
325325

326326
#[test]
@@ -373,7 +373,7 @@ fn test_all() {
373373
assert!(v.iter().all(|&x| x < 10));
374374
assert!(!v.iter().all(|&x| x % 2 == 0));
375375
assert!(!v.iter().all(|&x| x > 100));
376-
assert!(v[0..0].iter().all(|_| panic!()));
376+
assert!(v[..0].iter().all(|_| panic!()));
377377
}
378378

379379
#[test]
@@ -382,7 +382,7 @@ fn test_any() {
382382
assert!(v.iter().any(|&x| x < 10));
383383
assert!(v.iter().any(|&x| x % 2 == 0));
384384
assert!(!v.iter().any(|&x| x > 100));
385-
assert!(!v[0..0].iter().any(|_| panic!()));
385+
assert!(!v[..0].iter().any(|_| panic!()));
386386
}
387387

388388
#[test]

src/libfmt_macros/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ impl<'a> Parser<'a> {
286286
flags: 0,
287287
precision: CountImplied,
288288
width: CountImplied,
289-
ty: &self.input[0..0],
289+
ty: &self.input[..0],
290290
};
291291
if !self.consume(':') { return spec }
292292

@@ -395,7 +395,7 @@ impl<'a> Parser<'a> {
395395
self.cur.next();
396396
pos
397397
}
398-
Some(..) | None => { return &self.input[0..0]; }
398+
Some(..) | None => { return &self.input[..0]; }
399399
};
400400
let mut end;
401401
loop {

src/librand/lib.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -270,8 +270,7 @@ pub trait Rng : Sized {
270270
/// let choices = [1i, 2, 4, 8, 16, 32];
271271
/// let mut rng = thread_rng();
272272
/// println!("{:?}", rng.choose(&choices));
273-
/// # // uncomment when slicing syntax is stable
274-
/// //assert_eq!(rng.choose(&choices[0..0]), None);
273+
/// assert_eq!(rng.choose(&choices[..0]), None);
275274
/// ```
276275
fn choose<'a, T>(&mut self, values: &'a [T]) -> Option<&'a T> {
277276
if values.is_empty() {

src/librbml/io.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ impl Writer for SeekableMemWriter {
9595
// there (left), and what will be appended on the end (right)
9696
let cap = self.buf.len() - self.pos;
9797
let (left, right) = if cap <= buf.len() {
98-
(&buf[0..cap], &buf[cap..])
98+
(&buf[..cap], &buf[cap..])
9999
} else {
100100
let result: (_, &[_]) = (buf, &[]);
101101
result

src/librustc/middle/check_match.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -926,7 +926,7 @@ pub fn specialize<'a>(cx: &MatchCheckCtxt, r: &[&'a Pat],
926926
}
927927
};
928928
head.map(|mut head| {
929-
head.push_all(&r[0..col]);
929+
head.push_all(&r[..col]);
930930
head.push_all(&r[(col + 1)..]);
931931
head
932932
})

src/librustc/util/ppaux.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ pub fn parameterized<'tcx>(cx: &ctxt<'tcx>,
542542
0
543543
};
544544

545-
for t in tps[0..(tps.len() - num_defaults)].iter() {
545+
for t in tps[..(tps.len() - num_defaults)].iter() {
546546
strs.push(ty_to_string(cx, *t))
547547
}
548548

src/librustc_back/sha2.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ impl FixedBuffer for FixedBuffer64 {
140140
if input.len() >= buffer_remaining {
141141
copy_memory(
142142
self.buffer.slice_mut(self.buffer_idx, size),
143-
&input[0..buffer_remaining]);
143+
&input[..buffer_remaining]);
144144
self.buffer_idx = 0;
145145
func(&self.buffer);
146146
i += buffer_remaining;
@@ -188,7 +188,7 @@ impl FixedBuffer for FixedBuffer64 {
188188
fn full_buffer<'s>(&'s mut self) -> &'s [u8] {
189189
assert!(self.buffer_idx == 64);
190190
self.buffer_idx = 0;
191-
return &self.buffer[0..64];
191+
return &self.buffer[..64];
192192
}
193193

194194
fn position(&self) -> uint { self.buffer_idx }

src/librustc_resolve/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2081,7 +2081,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
20812081
// idx +- 1 to account for the
20822082
// colons on either side
20832083
&mpath[(idx + 1)..],
2084-
&mpath[0..(idx - 1)]);
2084+
&mpath[..(idx - 1)]);
20852085
return Failed(Some((span, msg)));
20862086
},
20872087
None => {

src/librustc_trans/back/lto.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ pub fn run(sess: &session::Session, llmod: ModuleRef,
186186
fn is_versioned_bytecode_format(bc: &[u8]) -> bool {
187187
let magic_id_byte_count = link::RLIB_BYTECODE_OBJECT_MAGIC.len();
188188
return bc.len() > magic_id_byte_count &&
189-
&bc[0..magic_id_byte_count] == link::RLIB_BYTECODE_OBJECT_MAGIC;
189+
&bc[..magic_id_byte_count] == link::RLIB_BYTECODE_OBJECT_MAGIC;
190190
}
191191

192192
fn extract_bytecode_format_version(bc: &[u8]) -> u32 {

src/librustc_trans/save/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ impl <'l, 'tcx> DxrVisitor<'l, 'tcx> {
186186
if len <= 2 {
187187
return;
188188
}
189-
let sub_paths = &sub_paths[0..(len-2)];
189+
let sub_paths = &sub_paths[..(len-2)];
190190
for &(ref span, ref qualname) in sub_paths.iter() {
191191
self.fmt.sub_mod_ref_str(path.span,
192192
*span,

src/librustc_trans/save/recorder.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ impl<'a> FmtStrs<'a> {
166166
let values = values.iter().map(|s| {
167167
// Never take more than 1020 chars
168168
if s.len() > 1020 {
169-
&s[0..1020]
169+
&s[..1020]
170170
} else {
171171
&s[]
172172
}

src/librustc_trans/trans/_match.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ fn enter_default<'a, 'p, 'blk, 'tcx>(bcx: Block<'blk, 'tcx>,
471471
// Collect all of the matches that can match against anything.
472472
enter_match(bcx, dm, m, col, val, |pats| {
473473
if pat_is_binding_or_wild(dm, &*pats[col]) {
474-
let mut r = pats[0..col].to_vec();
474+
let mut r = pats[..col].to_vec();
475475
r.push_all(&pats[(col + 1)..]);
476476
Some(r)
477477
} else {

src/librustc_trans/trans/builder.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
552552
for (small_vec_e, &ix) in small_vec.iter_mut().zip(ixs.iter()) {
553553
*small_vec_e = C_i32(self.ccx, ix as i32);
554554
}
555-
self.inbounds_gep(base, &small_vec[0..ixs.len()])
555+
self.inbounds_gep(base, &small_vec[..ixs.len()])
556556
} else {
557557
let v = ixs.iter().map(|i| C_i32(self.ccx, *i as i32)).collect::<Vec<ValueRef>>();
558558
self.count_insn("gepi");

src/librustc_trans/trans/debuginfo.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -986,7 +986,7 @@ pub fn create_captured_var_metadata<'blk, 'tcx>(bcx: Block<'blk, 'tcx>,
986986

987987
let variable_access = IndirectVariable {
988988
alloca: env_pointer,
989-
address_operations: &address_operations[0..address_op_count]
989+
address_operations: &address_operations[..address_op_count]
990990
};
991991

992992
declare_local(bcx,

src/librustdoc/html/format.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ fn path<F, G>(w: &mut fmt::Formatter,
332332
match rel_root {
333333
Some(root) => {
334334
let mut root = String::from_str(root.as_slice());
335-
for seg in path.segments[0..amt].iter() {
335+
for seg in path.segments[..amt].iter() {
336336
if "super" == seg.name ||
337337
"self" == seg.name {
338338
try!(write!(w, "{}::", seg.name));
@@ -347,7 +347,7 @@ fn path<F, G>(w: &mut fmt::Formatter,
347347
}
348348
}
349349
None => {
350-
for seg in path.segments[0..amt].iter() {
350+
for seg in path.segments[..amt].iter() {
351351
try!(write!(w, "{}::", seg.name));
352352
}
353353
}

0 commit comments

Comments
 (0)