Skip to content

Commit 37a94b8

Browse files
committed
Use temp vars for implicit coercion to ^[T]
1 parent 34d607f commit 37a94b8

31 files changed

+381
-215
lines changed

src/libcollections/bitv.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2557,7 +2557,7 @@ mod tests {
25572557
}
25582558

25592559
fn rng() -> rand::IsaacRng {
2560-
let seed = &[1, 2, 3, 4, 5, 6, 7, 8, 9, 0];
2560+
let seed: &[_] = &[1, 2, 3, 4, 5, 6, 7, 8, 9, 0];
25612561
rand::SeedableRng::from_seed(seed)
25622562
}
25632563

src/libcollections/dlist.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1088,7 +1088,8 @@ mod tests {
10881088
let n = list_from([1i,2,3]);
10891089
spawn(proc() {
10901090
check_links(&n);
1091-
assert_eq!(&[&1,&2,&3], n.iter().collect::<Vec<&int>>().as_slice());
1091+
let a: &[_] = &[&1,&2,&3];
1092+
assert_eq!(a, n.iter().collect::<Vec<&int>>().as_slice());
10921093
});
10931094
}
10941095

src/libcollections/hash/mod.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,8 @@ mod tests {
346346
assert_eq!(hasher.hash(&'a'), 97);
347347

348348
assert_eq!(hasher.hash(&("a")), 97 + 0xFF);
349-
assert_eq!(hasher.hash(& &[1u8, 2u8, 3u8]), 9);
349+
let cs: &[u8] = &[1u8, 2u8, 3u8];
350+
assert_eq!(hasher.hash(& cs), 9);
350351

351352
unsafe {
352353
let ptr: *const int = mem::transmute(5i);

src/libcollections/hash/sip.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -495,8 +495,8 @@ mod tests {
495495
assert!(s != t && t != u);
496496
assert!(hash(&s) != hash(&t) && hash(&s) != hash(&u));
497497

498-
let v = (&[1u8], &[0u8, 0], &[0u8]);
499-
let w = (&[1u8, 0, 0, 0], &[], &[]);
498+
let v: (&[u8], &[u8], &[u8]) = (&[1u8], &[0u8, 0], &[0u8]);
499+
let w: (&[u8], &[u8], &[u8]) = (&[1u8, 0, 0, 0], &[], &[]);
500500

501501
assert!(v != w);
502502
assert!(hash(&v) != hash(&w));

src/libcollections/ringbuf.rs

+14-4
Original file line numberDiff line numberDiff line change
@@ -865,12 +865,18 @@ mod tests {
865865
for i in range(0i, 5) {
866866
d.push_back(i);
867867
}
868-
assert_eq!(d.iter().collect::<Vec<&int>>().as_slice(), &[&0,&1,&2,&3,&4]);
868+
{
869+
let b: &[_] = &[&0,&1,&2,&3,&4];
870+
assert_eq!(d.iter().collect::<Vec<&int>>().as_slice(), b);
871+
}
869872

870873
for i in range(6i, 9) {
871874
d.push_front(i);
872875
}
873-
assert_eq!(d.iter().collect::<Vec<&int>>().as_slice(), &[&8,&7,&6,&0,&1,&2,&3,&4]);
876+
{
877+
let b: &[_] = &[&8,&7,&6,&0,&1,&2,&3,&4];
878+
assert_eq!(d.iter().collect::<Vec<&int>>().as_slice(), b);
879+
}
874880

875881
let mut it = d.iter();
876882
let mut len = d.len();
@@ -890,12 +896,16 @@ mod tests {
890896
for i in range(0i, 5) {
891897
d.push_back(i);
892898
}
893-
assert_eq!(d.iter().rev().collect::<Vec<&int>>().as_slice(), &[&4,&3,&2,&1,&0]);
899+
{
900+
let b: &[_] = &[&4,&3,&2,&1,&0];
901+
assert_eq!(d.iter().rev().collect::<Vec<&int>>().as_slice(), b);
902+
}
894903

895904
for i in range(6i, 9) {
896905
d.push_front(i);
897906
}
898-
assert_eq!(d.iter().rev().collect::<Vec<&int>>().as_slice(), &[&4,&3,&2,&1,&0,&6,&7,&8]);
907+
let b: &[_] = &[&4,&3,&2,&1,&0,&6,&7,&8];
908+
assert_eq!(d.iter().rev().collect::<Vec<&int>>().as_slice(), b);
899909
}
900910

901911
#[test]

0 commit comments

Comments
 (0)