Skip to content

Commit 613ae0b

Browse files
alexcrichtonalexcrichton
committed
rollup merge of rust-lang#17106 : treeman/test-warnings
2 parents a9d8f29 + 947a1b9 commit 613ae0b

File tree

15 files changed

+79
-70
lines changed

15 files changed

+79
-70
lines changed

‎src/libarena/lib.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -509,6 +509,7 @@ mod tests {
509509
use self::test::Bencher;
510510
use super::{Arena, TypedArena};
511511

512+
#[allow(dead_code)]
512513
struct Point {
513514
x: int,
514515
y: int,
@@ -564,6 +565,7 @@ mod tests {
564565
})
565566
}
566567

568+
#[allow(dead_code)]
567569
struct Noncopy {
568570
string: String,
569571
array: Vec<int>,

‎src/libcollections/slice.rs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -864,6 +864,7 @@ mod tests {
864864
}
865865

866866
#[test]
867+
#[allow(deprecated)]
867868
fn test_tailn() {
868869
let mut a = vec![11i, 12, 13];
869870
let b: &[int] = &[11, 12, 13];
@@ -875,6 +876,7 @@ mod tests {
875876

876877
#[test]
877878
#[should_fail]
879+
#[allow(deprecated)]
878880
fn test_tailn_empty() {
879881
let a: Vec<int> = vec![];
880882
a.tailn(2);
@@ -909,6 +911,7 @@ mod tests {
909911

910912
#[test]
911913
#[should_fail]
914+
#[allow(deprecated)]
912915
fn test_initn_empty() {
913916
let a: Vec<int> = vec![];
914917
a.as_slice().initn(2);
@@ -1466,6 +1469,7 @@ mod tests {
14661469
}
14671470

14681471
#[test]
1472+
#[allow(deprecated)]
14691473
fn test_unshift() {
14701474
let mut x = vec![1i, 2, 3];
14711475
x.unshift(0);
@@ -2079,6 +2083,7 @@ mod tests {
20792083
}
20802084

20812085
#[test]
2086+
#[allow(deprecated)]
20822087
fn test_shift_ref() {
20832088
let mut x: &[int] = [1, 2, 3, 4, 5];
20842089
let h = x.shift_ref();
@@ -2092,6 +2097,7 @@ mod tests {
20922097
}
20932098

20942099
#[test]
2100+
#[allow(deprecated)]
20952101
fn test_pop_ref() {
20962102
let mut x: &[int] = [1, 2, 3, 4, 5];
20972103
let h = x.pop_ref();
@@ -2171,6 +2177,7 @@ mod tests {
21712177
}
21722178

21732179
#[test]
2180+
#[allow(deprecated)]
21742181
fn test_mut_shift_ref() {
21752182
let mut x: &mut [int] = [1, 2, 3, 4, 5];
21762183
let h = x.mut_shift_ref();
@@ -2184,6 +2191,7 @@ mod tests {
21842191
}
21852192

21862193
#[test]
2194+
#[allow(deprecated)]
21872195
fn test_mut_pop_ref() {
21882196
let mut x: &mut [int] = [1, 2, 3, 4, 5];
21892197
let h = x.mut_pop_ref();
@@ -2441,7 +2449,7 @@ mod bench {
24412449
b.iter(|| {
24422450
v.sort();
24432451
});
2444-
b.bytes = (v.len() * mem::size_of_val(v.get(0))) as u64;
2452+
b.bytes = (v.len() * mem::size_of_val(&v[0])) as u64;
24452453
}
24462454

24472455
type BigSortable = (u64,u64,u64,u64);
@@ -2485,6 +2493,6 @@ mod bench {
24852493
b.iter(|| {
24862494
v.sort();
24872495
});
2488-
b.bytes = (v.len() * mem::size_of_val(v.get(0))) as u64;
2496+
b.bytes = (v.len() * mem::size_of_val(&v[0])) as u64;
24892497
}
24902498
}

‎src/libcoretest/any.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,61 +51,61 @@ fn any_owning() {
5151
}
5252

5353
#[test]
54-
fn any_as_ref() {
54+
fn any_downcast_ref() {
5555
let a = &5u as &Any;
5656

57-
match a.as_ref::<uint>() {
57+
match a.downcast_ref::<uint>() {
5858
Some(&5) => {}
5959
x => fail!("Unexpected value {}", x)
6060
}
6161

62-
match a.as_ref::<Test>() {
62+
match a.downcast_ref::<Test>() {
6363
None => {}
6464
x => fail!("Unexpected value {}", x)
6565
}
6666
}
6767

6868
#[test]
69-
fn any_as_mut() {
69+
fn any_downcast_mut() {
7070
let mut a = 5u;
7171
let mut b = box 7u;
7272

7373
let a_r = &mut a as &mut Any;
7474
let tmp: &mut uint = &mut *b;
7575
let b_r = tmp as &mut Any;
7676

77-
match a_r.as_mut::<uint>() {
77+
match a_r.downcast_mut::<uint>() {
7878
Some(x) => {
7979
assert_eq!(*x, 5u);
8080
*x = 612;
8181
}
8282
x => fail!("Unexpected value {}", x)
8383
}
8484

85-
match b_r.as_mut::<uint>() {
85+
match b_r.downcast_mut::<uint>() {
8686
Some(x) => {
8787
assert_eq!(*x, 7u);
8888
*x = 413;
8989
}
9090
x => fail!("Unexpected value {}", x)
9191
}
9292

93-
match a_r.as_mut::<Test>() {
93+
match a_r.downcast_mut::<Test>() {
9494
None => (),
9595
x => fail!("Unexpected value {}", x)
9696
}
9797

98-
match b_r.as_mut::<Test>() {
98+
match b_r.downcast_mut::<Test>() {
9999
None => (),
100100
x => fail!("Unexpected value {}", x)
101101
}
102102

103-
match a_r.as_mut::<uint>() {
103+
match a_r.downcast_mut::<uint>() {
104104
Some(&612) => {}
105105
x => fail!("Unexpected value {}", x)
106106
}
107107

108-
match b_r.as_mut::<uint>() {
108+
match b_r.downcast_mut::<uint>() {
109109
Some(&413) => {}
110110
x => fail!("Unexpected value {}", x)
111111
}
@@ -121,11 +121,11 @@ fn any_fixed_vec() {
121121

122122

123123
#[bench]
124-
fn bench_as_ref(b: &mut Bencher) {
124+
fn bench_downcast_ref(b: &mut Bencher) {
125125
b.iter(|| {
126126
let mut x = 0i;
127127
let mut y = &mut x as &mut Any;
128128
test::black_box(&mut y);
129-
test::black_box(y.as_ref::<int>() == Some(&0));
129+
test::black_box(y.downcast_ref::<int>() == Some(&0));
130130
});
131131
}

‎src/libcoretest/option.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ fn test_or_else() {
131131
}
132132

133133
#[test]
134+
#[allow(deprecated)]
134135
fn test_option_while_some() {
135136
let mut i = 0i;
136137
Some(10i).while_some(|j| {
@@ -184,6 +185,7 @@ fn test_unwrap_or_else() {
184185
}
185186

186187
#[test]
188+
#[allow(deprecated)]
187189
fn test_filtered() {
188190
let some_stuff = Some(42i);
189191
let modified_stuff = some_stuff.filtered(|&x| {x < 10});
@@ -256,6 +258,7 @@ fn test_mutate() {
256258
}
257259

258260
#[test]
261+
#[allow(deprecated)]
259262
fn test_collect() {
260263
let v: Option<Vec<int>> = collect(range(0i, 0)
261264
.map(|_| Some(0i)));

‎src/libcoretest/result.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ pub fn test_impl_map_err() {
6969
}
7070

7171
#[test]
72+
#[allow(deprecated)]
7273
fn test_collect() {
7374
let v: Result<Vec<int>, ()> = collect(range(0i, 0).map(|_| Ok::<int, ()>(0)));
7475
assert!(v == Ok(vec![]));

‎src/libdebug/repr.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -568,6 +568,7 @@ pub fn repr_to_string<T>(t: &T) -> String {
568568
}
569569

570570
#[cfg(test)]
571+
#[allow(dead_code)]
571572
struct P {a: int, b: f64}
572573

573574
#[test]

‎src/libgraphviz/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -632,9 +632,9 @@ mod tests {
632632
id_name(n)
633633
}
634634
fn node_label(&'a self, n: &Node) -> LabelText<'a> {
635-
match self.node_labels.get(*n) {
636-
&Some(ref l) => LabelStr(str::Slice(l.as_slice())),
637-
&None => LabelStr(id_name(n).name()),
635+
match self.node_labels[*n] {
636+
Some(ref l) => LabelStr(str::Slice(l.as_slice())),
637+
None => LabelStr(id_name(n).name()),
638638
}
639639
}
640640
fn edge_label(&'a self, e: & &'a Edge) -> LabelText<'a> {

‎src/libgreen/sched.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1414,6 +1414,7 @@ mod test {
14141414
// Regression test that the `start` task entrypoint can
14151415
// contain dtors that use task resources
14161416
run(proc() {
1417+
#[allow(dead_code)]
14171418
struct S { field: () }
14181419

14191420
impl Drop for S {

‎src/libnum/bigint.rs

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1978,10 +1978,10 @@ mod biguint_tests {
19781978
#[test]
19791979
fn test_checked_add() {
19801980
for elm in sum_triples.iter() {
1981-
let (aVec, bVec, cVec) = *elm;
1982-
let a = BigUint::from_slice(aVec);
1983-
let b = BigUint::from_slice(bVec);
1984-
let c = BigUint::from_slice(cVec);
1981+
let (a_vec, b_vec, c_vec) = *elm;
1982+
let a = BigUint::from_slice(a_vec);
1983+
let b = BigUint::from_slice(b_vec);
1984+
let c = BigUint::from_slice(c_vec);
19851985

19861986
assert!(a.checked_add(&b).unwrap() == c);
19871987
assert!(b.checked_add(&a).unwrap() == c);
@@ -1991,10 +1991,10 @@ mod biguint_tests {
19911991
#[test]
19921992
fn test_checked_sub() {
19931993
for elm in sum_triples.iter() {
1994-
let (aVec, bVec, cVec) = *elm;
1995-
let a = BigUint::from_slice(aVec);
1996-
let b = BigUint::from_slice(bVec);
1997-
let c = BigUint::from_slice(cVec);
1994+
let (a_vec, b_vec, c_vec) = *elm;
1995+
let a = BigUint::from_slice(a_vec);
1996+
let b = BigUint::from_slice(b_vec);
1997+
let c = BigUint::from_slice(c_vec);
19981998

19991999
assert!(c.checked_sub(&a).unwrap() == b);
20002000
assert!(c.checked_sub(&b).unwrap() == a);
@@ -2011,21 +2011,21 @@ mod biguint_tests {
20112011
#[test]
20122012
fn test_checked_mul() {
20132013
for elm in mul_triples.iter() {
2014-
let (aVec, bVec, cVec) = *elm;
2015-
let a = BigUint::from_slice(aVec);
2016-
let b = BigUint::from_slice(bVec);
2017-
let c = BigUint::from_slice(cVec);
2014+
let (a_vec, b_vec, c_vec) = *elm;
2015+
let a = BigUint::from_slice(a_vec);
2016+
let b = BigUint::from_slice(b_vec);
2017+
let c = BigUint::from_slice(c_vec);
20182018

20192019
assert!(a.checked_mul(&b).unwrap() == c);
20202020
assert!(b.checked_mul(&a).unwrap() == c);
20212021
}
20222022

20232023
for elm in div_rem_quadruples.iter() {
2024-
let (aVec, bVec, cVec, dVec) = *elm;
2025-
let a = BigUint::from_slice(aVec);
2026-
let b = BigUint::from_slice(bVec);
2027-
let c = BigUint::from_slice(cVec);
2028-
let d = BigUint::from_slice(dVec);
2024+
let (a_vec, b_vec, c_vec, d_vec) = *elm;
2025+
let a = BigUint::from_slice(a_vec);
2026+
let b = BigUint::from_slice(b_vec);
2027+
let c = BigUint::from_slice(c_vec);
2028+
let d = BigUint::from_slice(d_vec);
20292029

20302030
assert!(a == b.checked_mul(&c).unwrap() + d);
20312031
assert!(a == c.checked_mul(&b).unwrap() + d);
@@ -2035,10 +2035,10 @@ mod biguint_tests {
20352035
#[test]
20362036
fn test_checked_div() {
20372037
for elm in mul_triples.iter() {
2038-
let (aVec, bVec, cVec) = *elm;
2039-
let a = BigUint::from_slice(aVec);
2040-
let b = BigUint::from_slice(bVec);
2041-
let c = BigUint::from_slice(cVec);
2038+
let (a_vec, b_vec, c_vec) = *elm;
2039+
let a = BigUint::from_slice(a_vec);
2040+
let b = BigUint::from_slice(b_vec);
2041+
let c = BigUint::from_slice(c_vec);
20422042

20432043
if !a.is_zero() {
20442044
assert!(c.checked_div(&a).unwrap() == b);
@@ -2651,10 +2651,10 @@ mod bigint_tests {
26512651
#[test]
26522652
fn test_checked_add() {
26532653
for elm in sum_triples.iter() {
2654-
let (aVec, bVec, cVec) = *elm;
2655-
let a = BigInt::from_slice(Plus, aVec);
2656-
let b = BigInt::from_slice(Plus, bVec);
2657-
let c = BigInt::from_slice(Plus, cVec);
2654+
let (a_vec, b_vec, c_vec) = *elm;
2655+
let a = BigInt::from_slice(Plus, a_vec);
2656+
let b = BigInt::from_slice(Plus, b_vec);
2657+
let c = BigInt::from_slice(Plus, c_vec);
26582658

26592659
assert!(a.checked_add(&b).unwrap() == c);
26602660
assert!(b.checked_add(&a).unwrap() == c);
@@ -2670,10 +2670,10 @@ mod bigint_tests {
26702670
#[test]
26712671
fn test_checked_sub() {
26722672
for elm in sum_triples.iter() {
2673-
let (aVec, bVec, cVec) = *elm;
2674-
let a = BigInt::from_slice(Plus, aVec);
2675-
let b = BigInt::from_slice(Plus, bVec);
2676-
let c = BigInt::from_slice(Plus, cVec);
2673+
let (a_vec, b_vec, c_vec) = *elm;
2674+
let a = BigInt::from_slice(Plus, a_vec);
2675+
let b = BigInt::from_slice(Plus, b_vec);
2676+
let c = BigInt::from_slice(Plus, c_vec);
26772677

26782678
assert!(c.checked_sub(&a).unwrap() == b);
26792679
assert!(c.checked_sub(&b).unwrap() == a);
@@ -2689,10 +2689,10 @@ mod bigint_tests {
26892689
#[test]
26902690
fn test_checked_mul() {
26912691
for elm in mul_triples.iter() {
2692-
let (aVec, bVec, cVec) = *elm;
2693-
let a = BigInt::from_slice(Plus, aVec);
2694-
let b = BigInt::from_slice(Plus, bVec);
2695-
let c = BigInt::from_slice(Plus, cVec);
2692+
let (a_vec, b_vec, c_vec) = *elm;
2693+
let a = BigInt::from_slice(Plus, a_vec);
2694+
let b = BigInt::from_slice(Plus, b_vec);
2695+
let c = BigInt::from_slice(Plus, c_vec);
26962696

26972697
assert!(a.checked_mul(&b).unwrap() == c);
26982698
assert!(b.checked_mul(&a).unwrap() == c);
@@ -2702,11 +2702,11 @@ mod bigint_tests {
27022702
}
27032703

27042704
for elm in div_rem_quadruples.iter() {
2705-
let (aVec, bVec, cVec, dVec) = *elm;
2706-
let a = BigInt::from_slice(Plus, aVec);
2707-
let b = BigInt::from_slice(Plus, bVec);
2708-
let c = BigInt::from_slice(Plus, cVec);
2709-
let d = BigInt::from_slice(Plus, dVec);
2705+
let (a_vec, b_vec, c_vec, d_vec) = *elm;
2706+
let a = BigInt::from_slice(Plus, a_vec);
2707+
let b = BigInt::from_slice(Plus, b_vec);
2708+
let c = BigInt::from_slice(Plus, c_vec);
2709+
let d = BigInt::from_slice(Plus, d_vec);
27102710

27112711
assert!(a == b.checked_mul(&c).unwrap() + d);
27122712
assert!(a == c.checked_mul(&b).unwrap() + d);
@@ -2715,10 +2715,10 @@ mod bigint_tests {
27152715
#[test]
27162716
fn test_checked_div() {
27172717
for elm in mul_triples.iter() {
2718-
let (aVec, bVec, cVec) = *elm;
2719-
let a = BigInt::from_slice(Plus, aVec);
2720-
let b = BigInt::from_slice(Plus, bVec);
2721-
let c = BigInt::from_slice(Plus, cVec);
2718+
let (a_vec, b_vec, c_vec) = *elm;
2719+
let a = BigInt::from_slice(Plus, a_vec);
2720+
let b = BigInt::from_slice(Plus, b_vec);
2721+
let c = BigInt::from_slice(Plus, c_vec);
27222722

27232723
if !a.is_zero() {
27242724
assert!(c.checked_div(&a).unwrap() == b);

0 commit comments

Comments
 (0)