Skip to content

Commit 362d713

Browse files
nikomatsakisnikomatsakis
committed
Fix remaining bench/debuginfo tests (and a few stragglers)
1 parent 72eb214 commit 362d713

23 files changed

+85
-83
lines changed

‎src/test/bench/core-std.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ fn read_line() {
7575
let mut path = Path::new(env!("CFG_SRC_DIR"));
7676
path.push("src/test/bench/shootout-k-nucleotide.data");
7777

78-
for _ in 0u..3 {
78+
for _ in 0..3 {
7979
let mut reader = BufferedReader::new(File::open(&path).unwrap());
8080
for _line in reader.lines() {
8181
}
@@ -88,7 +88,7 @@ fn vec_plus() {
8888
let mut v = Vec::new();
8989
let mut i = 0;
9090
while i < 1500 {
91-
let rv = repeat(i).take(r.gen_range(0u, i + 1)).collect::<Vec<_>>();
91+
let rv = repeat(i).take(r.gen_range(0, i + 1)).collect::<Vec<_>>();
9292
if r.gen() {
9393
v.extend(rv.into_iter());
9494
} else {
@@ -106,7 +106,7 @@ fn vec_append() {
106106
let mut v = Vec::new();
107107
let mut i = 0;
108108
while i < 1500 {
109-
let rv = repeat(i).take(r.gen_range(0u, i + 1)).collect::<Vec<_>>();
109+
let rv = repeat(i).take(r.gen_range(0, i + 1)).collect::<Vec<_>>();
110110
if r.gen() {
111111
let mut t = v.clone();
112112
t.push_all(&rv);
@@ -125,8 +125,8 @@ fn vec_push_all() {
125125
let mut r = rand::thread_rng();
126126

127127
let mut v = Vec::new();
128-
for i in 0u..1500 {
129-
let mut rv = repeat(i).take(r.gen_range(0u, i + 1)).collect::<Vec<_>>();
128+
for i in 0..1500 {
129+
let mut rv = repeat(i).take(r.gen_range(0, i + 1)).collect::<Vec<_>>();
130130
if r.gen() {
131131
v.push_all(&rv);
132132
}
@@ -139,7 +139,7 @@ fn vec_push_all() {
139139

140140
fn is_utf8_ascii() {
141141
let mut v : Vec<u8> = Vec::new();
142-
for _ in 0u..20000 {
142+
for _ in 0..20000 {
143143
v.push('b' as u8);
144144
if str::from_utf8(&v).is_err() {
145145
panic!("from_utf8 panicked");
@@ -150,7 +150,7 @@ fn is_utf8_ascii() {
150150
fn is_utf8_multibyte() {
151151
let s = "b¢€𤭢";
152152
let mut v : Vec<u8> = Vec::new();
153-
for _ in 0u..5000 {
153+
for _ in 0..5000 {
154154
v.push_all(s.as_bytes());
155155
if str::from_utf8(&v).is_err() {
156156
panic!("from_utf8 panicked");

‎src/test/bench/core-uint-to-str.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ fn main() {
1414
let args = env::args();
1515
let args = if env::var_os("RUST_BENCH").is_some() {
1616
vec!("".to_string(), "10000000".to_string())
17-
} else if args.len() <= 1u {
17+
} else if args.len() <= 1 {
1818
vec!("".to_string(), "100000".to_string())
1919
} else {
2020
args.collect()
2121
};
2222

2323
let n = args[1].parse().unwrap();
2424

25-
for i in 0u..n {
25+
for i in 0..n {
2626
let x = i.to_string();
2727
println!("{}", x);
2828
}

‎src/test/bench/msgsend-pipes-shared.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ enum request {
3232
}
3333

3434
fn server(requests: &Receiver<request>, responses: &Sender<uint>) {
35-
let mut count = 0u;
35+
let mut count = 0;
3636
let mut done = false;
3737
while !done {
3838
match requests.recv() {
@@ -61,10 +61,10 @@ fn run(args: &[String]) {
6161
let dur = Duration::span(|| {
6262
let (to_child, to_parent, from_parent) = p.take().unwrap();
6363
let mut worker_results = Vec::new();
64-
for _ in 0u..workers {
64+
for _ in 0..workers {
6565
let to_child = to_child.clone();
6666
worker_results.push(thread::spawn(move|| {
67-
for _ in 0u..size / workers {
67+
for _ in 0..size / workers {
6868
//println!("worker {}: sending {} bytes", i, num_bytes);
6969
to_child.send(request::bytes(num_bytes)).unwrap();
7070
}

‎src/test/bench/msgsend-pipes.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ fn run(args: &[String]) {
5757
let from_parent = if workers == 1 {
5858
let (to_child, from_parent) = channel();
5959
worker_results.push(thread::spawn(move|| {
60-
for _ in 0u..size / workers {
60+
for _ in 0..size / workers {
6161
//println!("worker {}: sending {} bytes", i, num_bytes);
6262
to_child.send(request::bytes(num_bytes));
6363
}
@@ -66,10 +66,10 @@ fn run(args: &[String]) {
6666
from_parent
6767
} else {
6868
let (to_child, from_parent) = channel();
69-
for _ in 0u..workers {
69+
for _ in 0..workers {
7070
let to_child = to_child.clone();
7171
worker_results.push(thread::spawn(move|| {
72-
for _ in 0u..size / workers {
72+
for _ in 0..size / workers {
7373
//println!("worker {}: sending {} bytes", i, num_bytes);
7474
to_child.send(request::bytes(num_bytes));
7575
}

‎src/test/bench/msgsend-ring-mutex-arcs.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ fn thread_ring(i: uint, count: uint, num_chan: pipe, num_port: pipe) {
5050
let mut num_chan = Some(num_chan);
5151
let mut num_port = Some(num_port);
5252
// Send/Receive lots of messages.
53-
for j in 0u..count {
53+
for j in 0..count {
5454
//println!("task %?, iter %?", i, j);
5555
let num_chan2 = num_chan.take().unwrap();
5656
let num_port2 = num_port.take().unwrap();
@@ -84,7 +84,7 @@ fn main() {
8484
// create the ring
8585
let mut futures = Vec::new();
8686

87-
for i in 1u..num_tasks {
87+
for i in 1..num_tasks {
8888
//println!("spawning %?", i);
8989
let (new_chan, num_port) = init();
9090
let num_chan_2 = num_chan.clone();

‎src/test/bench/noise.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ fn main() {
113113
}
114114
}
115115

116-
for y in 0u..256 {
117-
for x in 0u..256 {
116+
for y in 0..256 {
117+
for x in 0..256 {
118118
let idx = (pixels[y*256+x] / 0.2) as uint;
119119
print!("{}", symbols[idx]);
120120
}

‎src/test/bench/shootout-chameneos-redux.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ fn main() {
233233
std::env::args()
234234
.nth(1)
235235
.and_then(|arg| arg.parse().ok())
236-
.unwrap_or(600us)
236+
.unwrap_or(600)
237237
};
238238

239239
print_complements();

‎src/test/bench/shootout-k-nucleotide-pipes.rs

+18-18
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ fn sort_and_fmt(mm: &HashMap<Vec<u8> , uint>, total: uint) -> String {
7777
fn find(mm: &HashMap<Vec<u8> , uint>, key: String) -> uint {
7878
let key = key.into_ascii_lowercase();
7979
match mm.get(key.as_bytes()) {
80-
option::Option::None => { return 0u; }
80+
option::Option::None => { return 0; }
8181
option::Option::Some(&num) => { return num; }
8282
}
8383
}
@@ -98,23 +98,23 @@ fn update_freq(mm: &mut HashMap<Vec<u8> , uint>, key: &[u8]) {
9898
fn windows_with_carry<F>(bb: &[u8], nn: uint, mut it: F) -> Vec<u8> where
9999
F: FnMut(&[u8]),
100100
{
101-
let mut ii = 0u;
101+
let mut ii = 0;
102102

103103
let len = bb.len();
104-
while ii < len - (nn - 1u) {
104+
while ii < len - (nn - 1) {
105105
it(&bb[ii..ii+nn]);
106-
ii += 1u;
106+
ii += 1;
107107
}
108108

109-
return bb[len - (nn - 1u)..len].to_vec();
109+
return bb[len - (nn - 1)..len].to_vec();
110110
}
111111

112112
fn make_sequence_processor(sz: uint,
113113
from_parent: &Receiver<Vec<u8>>,
114114
to_parent: &Sender<String>) {
115115
let mut freqs: HashMap<Vec<u8>, uint> = HashMap::new();
116116
let mut carry = Vec::new();
117-
let mut total: uint = 0u;
117+
let mut total: uint = 0;
118118

119119
let mut line: Vec<u8>;
120120

@@ -126,20 +126,20 @@ fn make_sequence_processor(sz: uint,
126126
carry.push_all(&line);
127127
carry = windows_with_carry(&carry, sz, |window| {
128128
update_freq(&mut freqs, window);
129-
total += 1u;
129+
total += 1;
130130
});
131131
}
132132

133133
let buffer = match sz {
134-
1u => { sort_and_fmt(&freqs, total) }
135-
2u => { sort_and_fmt(&freqs, total) }
136-
3u => { format!("{}\t{}", find(&freqs, "GGT".to_string()), "GGT") }
137-
4u => { format!("{}\t{}", find(&freqs, "GGTA".to_string()), "GGTA") }
138-
6u => { format!("{}\t{}", find(&freqs, "GGTATT".to_string()), "GGTATT") }
139-
12u => { format!("{}\t{}", find(&freqs, "GGTATTTTAATT".to_string()), "GGTATTTTAATT") }
140-
18u => { format!("{}\t{}", find(&freqs, "GGTATTTTAATTTATAGT".to_string()),
134+
1 => { sort_and_fmt(&freqs, total) }
135+
2 => { sort_and_fmt(&freqs, total) }
136+
3 => { format!("{}\t{}", find(&freqs, "GGT".to_string()), "GGT") }
137+
4 => { format!("{}\t{}", find(&freqs, "GGTA".to_string()), "GGTA") }
138+
6 => { format!("{}\t{}", find(&freqs, "GGTATT".to_string()), "GGTATT") }
139+
12 => { format!("{}\t{}", find(&freqs, "GGTATTTTAATT".to_string()), "GGTATTTTAATT") }
140+
18 => { format!("{}\t{}", find(&freqs, "GGTATTTTAATTTATAGT".to_string()),
141141
"GGTATTTTAATTTATAGT") }
142-
_ => { "".to_string() }
142+
_ => { "".to_string() }
143143
};
144144

145145
to_parent.send(buffer).unwrap();
@@ -158,7 +158,7 @@ fn main() {
158158
let mut rdr = BufferedReader::new(rdr);
159159

160160
// initialize each sequence sorter
161-
let sizes = vec!(1u,2,3,4,6,12,18);
161+
let sizes: Vec<usize> = vec!(1,2,3,4,6,12,18);
162162
let mut streams = (0..sizes.len()).map(|_| {
163163
Some(channel::<String>())
164164
}).collect::<Vec<_>>();
@@ -177,7 +177,7 @@ fn main() {
177177
});
178178

179179
to_child
180-
}).collect::<Vec<Sender<Vec<u8> >> >();
180+
}).collect::<Vec<Sender<Vec<u8>>>>();
181181

182182

183183
// latch stores true after we've started
@@ -187,7 +187,7 @@ fn main() {
187187
for line in rdr.lines() {
188188
let line = line.unwrap().trim().to_string();
189189

190-
if line.len() == 0u { continue; }
190+
if line.len() == 0 { continue; }
191191

192192
match (line.as_bytes()[0] as char, proc_mode) {
193193

‎src/test/bench/shootout-k-nucleotide.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ fn main() {
301301
};
302302
let input = Arc::new(input);
303303

304-
let nb_freqs: Vec<_> = (1u..3).map(|i| {
304+
let nb_freqs: Vec<_> = (1..3).map(|i| {
305305
let input = input.clone();
306306
(i, thread::scoped(move|| generate_frequencies(&input, i)))
307307
}).collect();

‎src/test/bench/shootout-meteor.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ fn to_vec(raw_sol: &List<u64>) -> Vec<u8> {
222222
let mut sol = repeat('.' as u8).take(50).collect::<Vec<_>>();
223223
for &m in raw_sol.iter() {
224224
let id = '0' as u8 + get_id(m);
225-
for i in 0us..50 {
225+
for i in 0..50 {
226226
if m & 1 << i != 0 {
227227
sol[i] = id;
228228
}
@@ -297,7 +297,7 @@ fn search(
297297
let masks_at = &masks[i];
298298

299299
// for every unused piece
300-
for id in (0us..10).filter(|&id| board & (1 << (id + 50)) == 0) {
300+
for id in (0..10).filter(|&id| board & (1 << (id + 50)) == 0) {
301301
// for each mask that fits on the board
302302
for m in masks_at[id].iter().filter(|&m| board & *m == 0) {
303303
// This check is too costly.

‎src/test/bench/shootout-spectralnorm.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ fn spectralnorm(n: uint) -> f64 {
6969
let mut u = repeat(1.0).take(n).collect::<Vec<_>>();
7070
let mut v = u.clone();
7171
let mut tmp = v.clone();
72-
for _ in 0u..10 {
72+
for _ in 0..10 {
7373
mult_AtAv(&u, &mut v, &mut tmp);
7474
mult_AtAv(&v, &mut u, &mut tmp);
7575
}

‎src/test/bench/sudoku.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ impl Sudoku {
4949
}
5050

5151
pub fn from_vec(vec: &[[u8;9];9]) -> Sudoku {
52-
let g = (0..9u).map(|i| {
53-
(0..9u).map(|j| { vec[i][j] }).collect()
52+
let g = (0..9).map(|i| {
53+
(0..9).map(|j| { vec[i][j] }).collect()
5454
}).collect();
5555
return Sudoku::new(g)
5656
}
@@ -68,7 +68,7 @@ impl Sudoku {
6868
.split(',')
6969
.collect();
7070

71-
if comps.len() == 3u {
71+
if comps.len() == 3 {
7272
let row = comps[0].parse::<u8>().unwrap();
7373
let col = comps[1].parse::<u8>().unwrap();
7474
g[row as uint][col as uint] = comps[2].parse().unwrap();
@@ -102,7 +102,7 @@ impl Sudoku {
102102
}
103103
}
104104

105-
let mut ptr = 0u;
105+
let mut ptr = 0;
106106
let end = work.len();
107107
while ptr < end {
108108
let (row, col) = work[ptr];
@@ -111,11 +111,11 @@ impl Sudoku {
111111
(1 as u8);
112112
if self.next_color(row, col, the_color) {
113113
// yes: advance work list
114-
ptr = ptr + 1u;
114+
ptr = ptr + 1;
115115
} else {
116116
// no: redo this field aft recoloring pred; unless there is none
117-
if ptr == 0u { panic!("No solution found for this sudoku"); }
118-
ptr = ptr - 1u;
117+
if ptr == 0 { panic!("No solution found for this sudoku"); }
118+
ptr = ptr - 1;
119119
}
120120
}
121121
}

‎src/test/bench/task-perf-spawnalot.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ use std::env;
1212
use std::thread;
1313

1414
fn f(n: usize) {
15-
let mut i = 0u;
15+
let mut i = 0;
1616
while i < n {
1717
let _ = thread::spawn(move|| g()).join();
18-
i += 1u;
18+
i += 1;
1919
}
2020
}
2121

‎src/test/debuginfo/gdb-pretty-struct-and-enums.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ fn main() {
139139
let mixed_enum_tuple_var = MixedEnumTupleVar(106, 107, false);
140140
let mixed_enum_struct_var = MixedEnumStructVar { field1: 108.5, field2: 109 };
141141

142-
let some = Some(110u);
142+
let some = Some(110_usize);
143143
let none: Option<int> = None;
144144
let some_fat = Some("abc");
145145
let none_fat: Option<&'static str> = None;

‎src/test/debuginfo/lexical-scope-in-parameterless-closure.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818
// Nothing to do here really, just make sure it compiles. See issue #8513.
1919
fn main() {
2020
let _ = ||();
21-
let _ = (1u..3).map(|_| 5);
21+
let _ = (1_usize..3).map(|_| 5);
2222
}
2323

‎src/test/debuginfo/no-debug-attribute.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#![omit_gdb_pretty_printer_section]
2727

2828
fn function_with_debuginfo() {
29-
let abc = 10u;
29+
let abc = 10_usize;
3030
return (); // #break
3131
}
3232

‎src/test/debuginfo/option-like-enum.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -129,18 +129,18 @@ fn main() {
129129
let some_str: Option<&'static str> = Some("abc");
130130
let none_str: Option<&'static str> = None;
131131

132-
let some: Option<&u32> = Some(unsafe { std::mem::transmute(0x12345678u) });
132+
let some: Option<&u32> = Some(unsafe { std::mem::transmute(0x12345678_usize) });
133133
let none: Option<&u32> = None;
134134

135-
let full = MoreFields::Full(454545, unsafe { std::mem::transmute(0x87654321u) }, 9988);
135+
let full = MoreFields::Full(454545, unsafe { std::mem::transmute(0x87654321_usize) }, 9988);
136136

137137
let empty = MoreFields::Empty;
138138
let empty_gdb: &MoreFieldsRepr = unsafe { std::mem::transmute(&MoreFields::Empty) };
139139

140140
let droid = NamedFields::Droid {
141141
id: 675675,
142142
range: 10000001,
143-
internals: unsafe { std::mem::transmute(0x43218765u) }
143+
internals: unsafe { std::mem::transmute(0x43218765_usize) }
144144
};
145145

146146
let void_droid = NamedFields::Void;

0 commit comments

Comments
 (0)