Skip to content

Commit c8c1044

Browse files
GankraManishearth
authored andcommitted
---
yaml --- r: 179163 b: refs/heads/auto c: 73b9aeb h: refs/heads/master i: 179161: 1d9a848 179159: 9cb45ee v: v3
1 parent 15fd991 commit c8c1044

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1010
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1111
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1212
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
13-
refs/heads/auto: c4e12c1536322d909bfd317948ac3bb5f37fb782
13+
refs/heads/auto: 73b9aeb4295aaf6c215c5981150bfa2ac9ace60a
1414
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1515
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1616
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/libcollections/btree/set.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -890,7 +890,7 @@ mod test {
890890
fn test_from_iter() {
891891
let xs = [1, 2, 3, 4, 5, 6, 7, 8, 9];
892892

893-
let set: BTreeSet<int> = xs.iter().map(|&x| x).collect();
893+
let set: BTreeSet<_> = xs.iter().cloned().collect();
894894

895895
for x in &xs {
896896
assert!(set.contains(x));
@@ -899,8 +899,8 @@ mod test {
899899

900900
#[test]
901901
fn test_show() {
902-
let mut set: BTreeSet<int> = BTreeSet::new();
903-
let empty: BTreeSet<int> = BTreeSet::new();
902+
let mut set = BTreeSet::new();
903+
let empty = BTreeSet::<i32>::new();
904904

905905
set.insert(1);
906906
set.insert(2);

branches/auto/src/libcollections/slice.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1575,7 +1575,7 @@ mod tests {
15751575

15761576
#[test]
15771577
fn test_is_empty() {
1578-
let xs: [int; 0] = [];
1578+
let xs: [i32; 0] = [];
15791579
assert!(xs.is_empty());
15801580
assert!(![0].is_empty());
15811581
}
@@ -1913,7 +1913,7 @@ mod tests {
19131913
#[test]
19141914
fn test_permutations() {
19151915
{
1916-
let v: [int; 0] = [];
1916+
let v: [i32; 0] = [];
19171917
let mut it = v.permutations();
19181918
let (min_size, max_opt) = it.size_hint();
19191919
assert_eq!(min_size, 1);

branches/auto/src/libcollections/vec.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2146,10 +2146,10 @@ mod tests {
21462146

21472147
#[test]
21482148
fn test_partition() {
2149-
assert_eq!(vec![].into_iter().partition(|x: &int| *x < 3), (vec![], vec![]));
2150-
assert_eq!(vec![1, 2, 3].into_iter().partition(|x: &int| *x < 4), (vec![1, 2, 3], vec![]));
2151-
assert_eq!(vec![1, 2, 3].into_iter().partition(|x: &int| *x < 2), (vec![1], vec![2, 3]));
2152-
assert_eq!(vec![1, 2, 3].into_iter().partition(|x: &int| *x < 0), (vec![], vec![1, 2, 3]));
2149+
assert_eq!(vec![].into_iter().partition(|x: &i32| *x < 3), (vec![], vec![]));
2150+
assert_eq!(vec![1, 2, 3].into_iter().partition(|x| *x < 4), (vec![1, 2, 3], vec![]));
2151+
assert_eq!(vec![1, 2, 3].into_iter().partition(|x| *x < 2), (vec![1], vec![2, 3]));
2152+
assert_eq!(vec![1, 2, 3].into_iter().partition(|x| *x < 0), (vec![], vec![1, 2, 3]));
21532153
}
21542154

21552155
#[test]
@@ -2183,7 +2183,7 @@ mod tests {
21832183
#[test]
21842184
fn test_vec_truncate_drop() {
21852185
static mut drops: u32 = 0;
2186-
struct Elem(int);
2186+
struct Elem(i32);
21872187
impl Drop for Elem {
21882188
fn drop(&mut self) {
21892189
unsafe { drops += 1; }

branches/auto/src/libcollections/vec_map.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1053,7 +1053,7 @@ mod test_map {
10531053
assert!(m.insert(10, 11).is_none());
10541054

10551055
for (k, v) in &mut m {
1056-
*v += k as int;
1056+
*v += k as isize;
10571057
}
10581058

10591059
let mut it = m.iter();
@@ -1095,7 +1095,7 @@ mod test_map {
10951095
assert!(m.insert(10, 11).is_none());
10961096

10971097
for (k, v) in m.iter_mut().rev() {
1098-
*v += k as int;
1098+
*v += k as isize;
10991099
}
11001100

11011101
let mut it = m.iter();

0 commit comments

Comments
 (0)