rollup merge of #20562: nick29581/arrays-3

3 files changed, 21 insertions, 22 deletions

diff --git a/src/libcoretest/char.rs b/src/libcoretest/char.rs
index b581cdbd710..f901e800176 100644
--- a/src/libcoretest/char.rs
+++ b/src/libcoretest/char.rs
@@ -167,7 +167,7 @@ fn test_encode_utf8() {
     fn check(input: char, expect: &[u8]) {
         let mut buf = [0u8; 4];
         let n = input.encode_utf8(buf.as_mut_slice()).unwrap_or(0);
-        assert_eq!(buf[..n], expect);
+        assert_eq!(buf.index(&(0..n)), expect);
     }
 
     check('x', &[0x78]);
@@ -181,7 +181,7 @@ fn test_encode_utf16() {
     fn check(input: char, expect: &[u16]) {
         let mut buf = [0u16; 2];
         let n = input.encode_utf16(buf.as_mut_slice()).unwrap_or(0);
-        assert_eq!(buf[..n], expect);
+        assert_eq!(buf.index(&(0..n)), expect);
     }
 
     check('x', &[0x0078]);
diff --git a/src/libcoretest/iter.rs b/src/libcoretest/iter.rs
index 73db72d0313..61266a92649 100644
--- a/src/libcoretest/iter.rs
+++ b/src/libcoretest/iter.rs
@@ -14,7 +14,6 @@ use core::iter::MinMaxResult::*;
 use core::num::SignedInt;
 use core::uint;
 use core::cmp;
-use core::ops::Slice;
 
 use test::Bencher;
 
@@ -230,7 +229,7 @@ fn test_inspect() {
                .collect::<Vec<uint>>();
 
     assert_eq!(n, xs.len());
-    assert_eq!(xs[], ys[]);
+    assert_eq!(&xs[], &ys[]);
 }
 
 #[test]
@@ -281,21 +280,21 @@ fn test_iterator_nth() {
 fn test_iterator_last() {
     let v: &[_] = &[0i, 1, 2, 3, 4];
     assert_eq!(v.iter().last().unwrap(), &4);
-    assert_eq!(v[0..1].iter().last().unwrap(), &0);
+    assert_eq!(v[..1].iter().last().unwrap(), &0);
 }
 
 #[test]
 fn test_iterator_len() {
     let v: &[_] = &[0i, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
-    assert_eq!(v[0..4].iter().count(), 4);
-    assert_eq!(v[0..10].iter().count(), 10);
+    assert_eq!(v[..4].iter().count(), 4);
+    assert_eq!(v[..10].iter().count(), 10);
     assert_eq!(v[0..0].iter().count(), 0);
 }
 
 #[test]
 fn test_iterator_sum() {
     let v: &[_] = &[0i, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
-    assert_eq!(v[0..4].iter().map(|&x| x).sum(), 6);
+    assert_eq!(v[..4].iter().map(|&x| x).sum(), 6);
     assert_eq!(v.iter().map(|&x| x).sum(), 55);
     assert_eq!(v[0..0].iter().map(|&x| x).sum(), 0);
 }
@@ -374,7 +373,7 @@ fn test_all() {
     assert!(v.iter().all(|&x| x < 10));
     assert!(!v.iter().all(|&x| x % 2 == 0));
     assert!(!v.iter().all(|&x| x > 100));
-    assert!(v.slice_or_fail(&0, &0).iter().all(|_| panic!()));
+    assert!(v[0..0].iter().all(|_| panic!()));
 }
 
 #[test]
@@ -383,7 +382,7 @@ fn test_any() {
     assert!(v.iter().any(|&x| x < 10));
     assert!(v.iter().any(|&x| x % 2 == 0));
     assert!(!v.iter().any(|&x| x > 100));
-    assert!(!v.slice_or_fail(&0, &0).iter().any(|_| panic!()));
+    assert!(!v[0..0].iter().any(|_| panic!()));
 }
 
 #[test]
@@ -586,7 +585,7 @@ fn check_randacc_iter<A, T>(a: T, len: uint) where
 fn test_double_ended_flat_map() {
     let u = [0u,1];
     let v = [5u,6,7,8];
-    let mut it = u.iter().flat_map(|x| v[*x..v.len()].iter());
+    let mut it = u.iter().flat_map(|x| v[(*x)..v.len()].iter());
     assert_eq!(it.next_back().unwrap(), &8);
     assert_eq!(it.next().unwrap(),      &5);
     assert_eq!(it.next_back().unwrap(), &7);
diff --git a/src/libcoretest/slice.rs b/src/libcoretest/slice.rs
index 9ef7d603059..b714b6a4e41 100644
--- a/src/libcoretest/slice.rs
+++ b/src/libcoretest/slice.rs
@@ -43,35 +43,35 @@ fn iterator_to_slice() {
 
             {
                 let mut iter = data.iter();
-                assert_eq!(iter[], other_data[]);
+                assert_eq!(&iter[], &other_data[]);
 
                 iter.next();
-                assert_eq!(iter[], other_data[1..]);
+                assert_eq!(&iter[], &other_data[1..]);
 
                 iter.next_back();
-                assert_eq!(iter[], other_data[1..2]);
+                assert_eq!(&iter[], &other_data[1..2]);
 
                 let s = iter.as_slice();
                 iter.next();
-                assert_eq!(s, other_data[1..2]);
+                assert_eq!(s, &other_data[1..2]);
             }
             {
                 let mut iter = data.iter_mut();
-                assert_eq!(iter[], other_data[]);
+                assert_eq!(iter.index(&FullRange), other_data.index(&FullRange));
                 // mutability:
-                assert!(iter[mut] == other_data);
+                assert!(&mut iter[] == other_data);
 
                 iter.next();
-                assert_eq!(iter[], other_data[1..]);
-                assert!(iter[mut] == other_data[mut 1..]);
+                assert_eq!(iter.index(&FullRange), other_data.index(&(1..)));
+                assert!(&mut iter[] == &mut other_data[1..]);
 
                 iter.next_back();
 
-                assert_eq!(iter[], other_data[1..2]);
-                assert!(iter[mut] == other_data[mut 1..2]);
+                assert_eq!(iter.index(&FullRange), other_data.index(&(1..2)));
+                assert!(&mut iter[] == &mut other_data[1..2]);
 
                 let s = iter.into_slice();
-                assert!(s == other_data[mut 1..2]);
+                assert!(s == &mut other_data[1..2]);
             }
         }}
     }