Skip to content

Commit 09707d7

Browse files
author
Jorge Aparicio
committed
Fix fallout
1 parent eac635d commit 09707d7

File tree

19 files changed

+59
-57
lines changed

19 files changed

+59
-57
lines changed

‎src/libcollections/dlist.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -945,15 +945,15 @@ mod tests {
945945
let mut m = list_from(v.as_slice());
946946
m.rotate_backward(); check_links(&m);
947947
m.rotate_forward(); check_links(&m);
948-
assert_eq!(v.iter().collect::<Vec<&int>>(), m.iter().collect());
948+
assert_eq!(v.iter().collect::<Vec<&int>>(), m.iter().collect::<Vec<_>>());
949949
m.rotate_forward(); check_links(&m);
950950
m.rotate_forward(); check_links(&m);
951951
m.pop_front(); check_links(&m);
952952
m.rotate_forward(); check_links(&m);
953953
m.rotate_backward(); check_links(&m);
954954
m.push_front(9); check_links(&m);
955955
m.rotate_forward(); check_links(&m);
956-
assert_eq!(vec![3i,9,5,1,2], m.into_iter().collect());
956+
assert_eq!(vec![3i,9,5,1,2], m.into_iter().collect::<Vec<_>>());
957957
}
958958

959959
#[test]

‎src/libcollections/enum_set.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -397,23 +397,23 @@ mod test {
397397
fn test_iterator() {
398398
let mut e1: EnumSet<Foo> = EnumSet::new();
399399

400-
let elems: Vec<Foo> = e1.iter().collect();
400+
let elems: ::vec::Vec<Foo> = e1.iter().collect();
401401
assert!(elems.is_empty())
402402

403403
e1.insert(A);
404-
let elems = e1.iter().collect();
404+
let elems: ::vec::Vec<_> = e1.iter().collect();
405405
assert_eq!(vec![A], elems)
406406

407407
e1.insert(C);
408-
let elems = e1.iter().collect();
408+
let elems: ::vec::Vec<_> = e1.iter().collect();
409409
assert_eq!(vec![A,C], elems)
410410

411411
e1.insert(C);
412-
let elems = e1.iter().collect();
412+
let elems: ::vec::Vec<_> = e1.iter().collect();
413413
assert_eq!(vec![A,C], elems)
414414

415415
e1.insert(B);
416-
let elems = e1.iter().collect();
416+
let elems: ::vec::Vec<_> = e1.iter().collect();
417417
assert_eq!(vec![A,B,C], elems)
418418
}
419419

@@ -431,35 +431,35 @@ mod test {
431431
e2.insert(C);
432432

433433
let e_union = e1 | e2;
434-
let elems = e_union.iter().collect();
434+
let elems: ::vec::Vec<_> = e_union.iter().collect();
435435
assert_eq!(vec![A,B,C], elems)
436436

437437
let e_intersection = e1 & e2;
438-
let elems = e_intersection.iter().collect();
438+
let elems: ::vec::Vec<_> = e_intersection.iter().collect();
439439
assert_eq!(vec![C], elems)
440440

441441
// Another way to express intersection
442442
let e_intersection = e1 - (e1 - e2);
443-
let elems = e_intersection.iter().collect();
443+
let elems: ::vec::Vec<_> = e_intersection.iter().collect();
444444
assert_eq!(vec![C], elems)
445445

446446
let e_subtract = e1 - e2;
447-
let elems = e_subtract.iter().collect();
447+
let elems: ::vec::Vec<_> = e_subtract.iter().collect();
448448
assert_eq!(vec![A], elems)
449449

450450
// Bitwise XOR of two sets, aka symmetric difference
451451
let e_symmetric_diff = e1 ^ e2;
452-
let elems = e_symmetric_diff.iter().collect();
452+
let elems: ::vec::Vec<_> = e_symmetric_diff.iter().collect();
453453
assert_eq!(vec![A,B], elems)
454454

455455
// Another way to express symmetric difference
456456
let e_symmetric_diff = (e1 - e2) | (e2 - e1);
457-
let elems = e_symmetric_diff.iter().collect();
457+
let elems: ::vec::Vec<_> = e_symmetric_diff.iter().collect();
458458
assert_eq!(vec![A,B], elems)
459459

460460
// Yet another way to express symmetric difference
461461
let e_symmetric_diff = (e1 | e2) - (e1 & e2);
462-
let elems = e_symmetric_diff.iter().collect();
462+
let elems: ::vec::Vec<_> = e_symmetric_diff.iter().collect();
463463
assert_eq!(vec![A,B], elems)
464464
}
465465

‎src/libcollections/string.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1010,10 +1010,12 @@ mod tests {
10101010
#[test]
10111011
fn test_from_utf8_lossy() {
10121012
let xs = b"hello";
1013-
assert_eq!(String::from_utf8_lossy(xs), "hello".into_cow());
1013+
let ys: str::CowString = "hello".into_cow();
1014+
assert_eq!(String::from_utf8_lossy(xs), ys);
10141015

10151016
let xs = "ศไทย中华Việt Nam".as_bytes();
1016-
assert_eq!(String::from_utf8_lossy(xs), "ศไทย中华Việt Nam".into_cow());
1017+
let ys: str::CowString = "ศไทย中华Việt Nam".into_cow();
1018+
assert_eq!(String::from_utf8_lossy(xs), ys);
10171019

10181020
let xs = b"Hello\xC2 There\xFF Goodbye";
10191021
assert_eq!(String::from_utf8_lossy(xs),

‎src/libcollections/vec.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1868,27 +1868,27 @@ mod tests {
18681868
let mut values = vec![1u8,2,3,4,5];
18691869
{
18701870
let slice = values.slice_from_mut(2);
1871-
assert!(slice == &mut [3, 4, 5]);
1871+
assert!(slice == [3, 4, 5]);
18721872
for p in slice.iter_mut() {
18731873
*p += 2;
18741874
}
18751875
}
18761876

1877-
assert!(values.as_slice() == &[1, 2, 5, 6, 7]);
1877+
assert!(values.as_slice() == [1, 2, 5, 6, 7]);
18781878
}
18791879

18801880
#[test]
18811881
fn test_slice_to_mut() {
18821882
let mut values = vec![1u8,2,3,4,5];
18831883
{
18841884
let slice = values.slice_to_mut(2);
1885-
assert!(slice == &mut [1, 2]);
1885+
assert!(slice == [1, 2]);
18861886
for p in slice.iter_mut() {
18871887
*p += 1;
18881888
}
18891889
}
18901890

1891-
assert!(values.as_slice() == &[2, 3, 3, 4, 5]);
1891+
assert!(values.as_slice() == [2, 3, 3, 4, 5]);
18921892
}
18931893

18941894
#[test]

‎src/libcore/intrinsics.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ extern "rust-intrinsic" {
226226
/// use std::mem;
227227
///
228228
/// let v: &[u8] = unsafe { mem::transmute("L") };
229-
/// assert!(v == &[76u8]);
229+
/// assert!(v == [76u8]);
230230
/// ```
231231
pub fn transmute<T,U>(e: T) -> U;
232232

‎src/libcore/option.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -274,9 +274,9 @@ impl<T> Option<T> {
274274
/// let mut x = Some("Diamonds");
275275
/// {
276276
/// let v = x.as_mut_slice();
277-
/// assert!(v == &mut ["Diamonds"]);
277+
/// assert!(v == ["Diamonds"]);
278278
/// v[0] = "Dirt";
279-
/// assert!(v == &mut ["Dirt"]);
279+
/// assert!(v == ["Dirt"]);
280280
/// }
281281
/// assert_eq!(x, Some("Dirt"));
282282
/// ```
@@ -554,7 +554,7 @@ impl<T> Option<T> {
554554
///
555555
/// let x = None;
556556
/// let v: Vec<&str> = x.into_iter().collect();
557-
/// assert_eq!(v, vec![]);
557+
/// assert!(v.is_empty());
558558
/// ```
559559
#[inline]
560560
#[unstable = "waiting for iterator conventions"]

‎src/libcore/result.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -407,14 +407,14 @@ impl<T, E> Result<T, E> {
407407
/// let mut x: Result<&str, uint> = Ok("Gold");
408408
/// {
409409
/// let v = x.as_mut_slice();
410-
/// assert!(v == &mut ["Gold"]);
410+
/// assert!(v == ["Gold"]);
411411
/// v[0] = "Silver";
412-
/// assert!(v == &mut ["Silver"]);
412+
/// assert!(v == ["Silver"]);
413413
/// }
414414
/// assert_eq!(x, Ok("Silver"));
415415
///
416416
/// let mut x: Result<&str, uint> = Err(45);
417-
/// assert!(x.as_mut_slice() == &mut []);
417+
/// assert!(x.as_mut_slice().is_empty());
418418
/// ```
419419
#[inline]
420420
#[unstable = "waiting for mut conventions"]

‎src/libcore/slice.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -374,20 +374,20 @@ pub trait SlicePrelude<T> for Sized? {
374374
/// // scoped to restrict the lifetime of the borrows
375375
/// {
376376
/// let (left, right) = v.split_at_mut(0);
377-
/// assert!(left == &mut []);
378-
/// assert!(right == &mut [1i, 2, 3, 4, 5, 6]);
377+
/// assert!(left == []);
378+
/// assert!(right == [1i, 2, 3, 4, 5, 6]);
379379
/// }
380380
///
381381
/// {
382382
/// let (left, right) = v.split_at_mut(2);
383-
/// assert!(left == &mut [1i, 2]);
384-
/// assert!(right == &mut [3i, 4, 5, 6]);
383+
/// assert!(left == [1i, 2]);
384+
/// assert!(right == [3i, 4, 5, 6]);
385385
/// }
386386
///
387387
/// {
388388
/// let (left, right) = v.split_at_mut(6);
389-
/// assert!(left == &mut [1i, 2, 3, 4, 5, 6]);
390-
/// assert!(right == &mut []);
389+
/// assert!(left == [1i, 2, 3, 4, 5, 6]);
390+
/// assert!(right == []);
391391
/// }
392392
/// ```
393393
#[unstable = "waiting on final error conventions"]

‎src/libcoretest/mem.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ fn test_transmute() {
109109
}
110110

111111
unsafe {
112-
assert!(vec![76u8] == transmute("L".to_string()));
112+
assert!(vec![76u8] == transmute::<_, Vec<u8>>("L".to_string()));
113113
}
114114
}
115115

‎src/librustc/middle/cfg/graphviz.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ fn replace_newline_with_backslash_l(s: String) -> String {
4040
let mut last_two: Vec<_> =
4141
s.as_slice().chars().rev().take(2).collect();
4242
last_two.reverse();
43-
if last_two.as_slice() != &['\\', 'l'] {
43+
if last_two != ['\\', 'l'] {
4444
s.push_str("\\l");
4545
}
4646
s

0 commit comments

Comments
 (0)