for x in range(a, b) -> for x in a..b

sed -i 's/in range(\([^,]*\), *\([^()]*\))/in \1\.\.\2/g' **/*.rs
This commit is contained in:
Jorge Aparicio 2015-01-26 15:46:12 -05:00
parent c300d681bd
commit 7d661af9c8
155 changed files with 490 additions and 490 deletions

View file

@ -40,19 +40,19 @@ fn ascending<M: MutableMap>(map: &mut M, n_keys: uint) {
println!(" Ascending integers:");
timed("insert", || {
for i in range(0u, n_keys) {
for i in 0u..n_keys {
map.insert(i, i + 1);
}
});
timed("search", || {
for i in range(0u, n_keys) {
for i in 0u..n_keys {
assert_eq!(map.find(&i).unwrap(), &(i + 1));
}
});
timed("remove", || {
for i in range(0, n_keys) {
for i in 0..n_keys {
assert!(map.remove(&i));
}
});
@ -74,7 +74,7 @@ fn descending<M: MutableMap>(map: &mut M, n_keys: uint) {
});
timed("remove", || {
for i in range(0, n_keys) {
for i in 0..n_keys {
assert!(map.remove(&i));
}
});
@ -82,19 +82,19 @@ fn descending<M: MutableMap>(map: &mut M, n_keys: uint) {
fn vector<M: MutableMap>(map: &mut M, n_keys: uint, dist: &[uint]) {
timed("insert", || {
for i in range(0u, n_keys) {
for i in 0u..n_keys {
map.insert(dist[i], i + 1);
}
});
timed("search", || {
for i in range(0u, n_keys) {
for i in 0u..n_keys {
assert_eq!(map.find(&dist[i]).unwrap(), &(i + 1));
}
});
timed("remove", || {
for i in range(0u, n_keys) {
for i in 0u..n_keys {
assert!(map.remove(&dist[i]));
}
});

View file

@ -71,11 +71,11 @@ impl Results {
{
let mut set = f();
timed(&mut self.sequential_ints, || {
for i in range(0u, num_keys) {
for i in 0u..num_keys {
set.insert(i);
}
for i in range(0u, num_keys) {
for i in 0u..num_keys {
assert!(set.contains(&i));
}
})
@ -84,7 +84,7 @@ impl Results {
{
let mut set = f();
timed(&mut self.random_ints, || {
for _ in range(0, num_keys) {
for _ in 0..num_keys {
set.insert(rng.gen::<uint>() % rand_cap);
}
})
@ -92,12 +92,12 @@ impl Results {
{
let mut set = f();
for i in range(0u, num_keys) {
for i in 0u..num_keys {
set.insert(i);
}
timed(&mut self.delete_ints, || {
for i in range(0u, num_keys) {
for i in 0u..num_keys {
assert!(set.remove(&i));
}
})
@ -114,11 +114,11 @@ impl Results {
{
let mut set = f();
timed(&mut self.sequential_strings, || {
for i in range(0u, num_keys) {
for i in 0u..num_keys {
set.insert(i.to_string());
}
for i in range(0u, num_keys) {
for i in 0u..num_keys {
assert!(set.contains(&i.to_string()));
}
})
@ -127,7 +127,7 @@ impl Results {
{
let mut set = f();
timed(&mut self.random_strings, || {
for _ in range(0, num_keys) {
for _ in 0..num_keys {
let s = rng.gen::<uint>().to_string();
set.insert(s);
}
@ -136,11 +136,11 @@ impl Results {
{
let mut set = f();
for i in range(0u, num_keys) {
for i in 0u..num_keys {
set.insert(i.to_string());
}
timed(&mut self.delete_strings, || {
for i in range(0u, num_keys) {
for i in 0u..num_keys {
assert!(set.remove(&i.to_string()));
}
})

View file

@ -76,7 +76,7 @@ fn read_line() {
let mut path = Path::new(env!("CFG_SRC_DIR"));
path.push("src/test/bench/shootout-k-nucleotide.data");
for _ in range(0u, 3) {
for _ in 0u..3 {
let mut reader = BufferedReader::new(File::open(&path).unwrap());
for _line in reader.lines() {
}
@ -126,7 +126,7 @@ fn vec_push_all() {
let mut r = rand::thread_rng();
let mut v = Vec::new();
for i in range(0u, 1500) {
for i in 0u..1500 {
let mut rv = repeat(i).take(r.gen_range(0u, i + 1)).collect::<Vec<_>>();
if r.gen() {
v.push_all(rv.as_slice());
@ -140,7 +140,7 @@ fn vec_push_all() {
fn is_utf8_ascii() {
let mut v : Vec<u8> = Vec::new();
for _ in range(0u, 20000) {
for _ in 0u..20000 {
v.push('b' as u8);
if str::from_utf8(v.as_slice()).is_err() {
panic!("from_utf8 panicked");
@ -151,7 +151,7 @@ fn is_utf8_ascii() {
fn is_utf8_multibyte() {
let s = "b¢€𤭢";
let mut v : Vec<u8> = Vec::new();
for _ in range(0u, 5000) {
for _ in 0u..5000 {
v.push_all(s.as_bytes());
if str::from_utf8(v.as_slice()).is_err() {
panic!("from_utf8 panicked");

View file

@ -22,7 +22,7 @@ fn main() {
let n = args[1].parse().unwrap();
for i in range(0u, n) {
for i in 0u..n {
let x = i.to_string();
println!("{}", x);
}

View file

@ -61,10 +61,10 @@ fn run(args: &[String]) {
let dur = Duration::span(|| {
let (to_child, to_parent, from_parent) = p.take().unwrap();
let mut worker_results = Vec::new();
for _ in range(0u, workers) {
for _ in 0u..workers {
let to_child = to_child.clone();
worker_results.push(Thread::scoped(move|| {
for _ in range(0u, size / workers) {
for _ in 0u..size / workers {
//println!("worker {}: sending {} bytes", i, num_bytes);
to_child.send(request::bytes(num_bytes)).unwrap();
}

View file

@ -57,7 +57,7 @@ fn run(args: &[String]) {
let from_parent = if workers == 1 {
let (to_child, from_parent) = channel();
worker_results.push(Thread::scoped(move|| {
for _ in range(0u, size / workers) {
for _ in 0u..size / workers {
//println!("worker {}: sending {} bytes", i, num_bytes);
to_child.send(request::bytes(num_bytes));
}
@ -66,10 +66,10 @@ fn run(args: &[String]) {
from_parent
} else {
let (to_child, from_parent) = channel();
for _ in range(0u, workers) {
for _ in 0u..workers {
let to_child = to_child.clone();
worker_results.push(Thread::scoped(move|| {
for _ in range(0u, size / workers) {
for _ in 0u..size / workers {
//println!("worker {}: sending {} bytes", i, num_bytes);
to_child.send(request::bytes(num_bytes));
}

View file

@ -50,7 +50,7 @@ fn thread_ring(i: uint, count: uint, num_chan: pipe, num_port: pipe) {
let mut num_chan = Some(num_chan);
let mut num_port = Some(num_port);
// Send/Receive lots of messages.
for j in range(0u, count) {
for j in 0u..count {
//println!("task %?, iter %?", i, j);
let num_chan2 = num_chan.take().unwrap();
let num_port2 = num_port.take().unwrap();
@ -84,7 +84,7 @@ fn main() {
// create the ring
let mut futures = Vec::new();
for i in range(1u, num_tasks) {
for i in 1u..num_tasks {
//println!("spawning %?", i);
let (new_chan, num_port) = init();
let num_chan_2 = num_chan.clone();

View file

@ -104,17 +104,17 @@ fn main() {
let mut pixels = [0f32; 256*256];
let n2d = Noise2DContext::new();
for _ in range(0u, 100) {
for y in range(0u, 256) {
for x in range(0u, 256) {
for _ in 0u..100 {
for y in 0u..256 {
for x in 0u..256 {
let v = n2d.get(x as f32 * 0.1, y as f32 * 0.1);
pixels[y*256+x] = v * 0.5 + 0.5;
}
}
}
for y in range(0u, 256) {
for x in range(0u, 256) {
for y in 0u..256 {
for x in 0u..256 {
let idx = (pixels[y*256+x] / 0.2) as uint;
print!("{}", symbols[idx]);
}

View file

@ -37,7 +37,7 @@ fn ping_pong_bench(n: uint, m: uint) {
let guard_a = Thread::scoped(move|| {
let (tx, rx) = (atx, brx);
for _ in range(0, n) {
for _ in 0..n {
tx.send(()).unwrap();
rx.recv().unwrap();
}
@ -45,7 +45,7 @@ fn ping_pong_bench(n: uint, m: uint) {
let guard_b = Thread::scoped(move|| {
let (tx, rx) = (btx, arx);
for _ in range(0, n) {
for _ in 0..n {
rx.recv().unwrap();
tx.send(()).unwrap();
}
@ -55,7 +55,7 @@ fn ping_pong_bench(n: uint, m: uint) {
guard_b.join().ok();
}
for _ in range(0, m) {
for _ in 0..m {
run_pair(n)
}
}

View file

@ -200,7 +200,7 @@ fn rendezvous(nn: uint, set: Vec<Color>) {
let mut creatures_met = 0;
// set up meetings...
for _ in range(0, nn) {
for _ in 0..nn {
let fst_creature = from_creatures.recv().unwrap();
let snd_creature = from_creatures.recv().unwrap();

View file

@ -78,7 +78,7 @@ struct Perm {
impl Perm {
fn new(n: u32) -> Perm {
let mut fact = [1; 16];
for i in range(1, n as uint + 1) {
for i in 1..n as uint + 1 {
fact[i] = fact[i - 1] * i as u32;
}
Perm {
@ -106,7 +106,7 @@ impl Perm {
}
let d = d as uint;
for j in range(0, i + 1) {
for j in 0..i + 1 {
self.perm.p[j] = if j + d <= i {pp[j + d]} else {pp[j+d-i-1]} as i32;
}
}

View file

@ -193,14 +193,14 @@ impl<'a, W: Writer> RandomFasta<'a, W> {
let chars_left = n % LINE_LEN;
let mut buf = [0;LINE_LEN + 1];
for _ in range(0, lines) {
for i in range(0u, LINE_LEN) {
for _ in 0..lines {
for i in 0u..LINE_LEN {
buf[i] = self.nextc();
}
buf[LINE_LEN] = '\n' as u8;
try!(self.out.write(&buf));
}
for i in range(0u, chars_left) {
for i in 0u..chars_left {
buf[i] = self.nextc();
}
self.out.write(&buf[..chars_left])

View file

@ -92,7 +92,7 @@ fn make_fasta<W: Writer, I: Iterator<Item=u8>>(
let mut line = [0u8; LINE_LENGTH + 1];
while n > 0 {
let nb = min(LINE_LENGTH, n);
for i in range(0, nb) {
for i in 0..nb {
line[i] = it.next().unwrap();
}
n -= nb;

View file

@ -84,7 +84,7 @@ impl Code {
fn unpack(&self, frame: uint) -> String {
let mut key = self.hash();
let mut result = Vec::new();
for _ in range(0, frame) {
for _ in 0..frame {
result.push(unpack_symbol((key as u8) & 3));
key >>= 2;
}
@ -242,7 +242,7 @@ fn generate_frequencies(mut input: &[u8], frame: uint) -> Table {
let mut code = Code(0);
// Pull first frame.
for _ in range(0, frame) {
for _ in 0..frame {
code = code.push_char(input[0]);
input = &input[1..];
}

View file

@ -93,7 +93,7 @@ fn mandelbrot<W: old_io::Writer>(w: uint, mut out: W) -> old_io::IoResult<()> {
};
// This assumes w == h
for x in range(start, end) {
for x in start..end {
let xf = x as f64;
let xy = f64x2(xf, xf);
@ -165,7 +165,7 @@ fn write_line(init_i: f64, vec_init_r: &[f64], res: &mut Vec<u8>) {
let mut i_sq = v_init_i * v_init_i;
let mut b = 0;
for _ in range(0, ITER) {
for _ in 0..ITER {
let r = cur_r;
let i = cur_i;

View file

@ -211,7 +211,7 @@ fn filter_masks(masks: &mut Vec<Vec<Vec<u64>>>) {
// Gets the identifier of a mask.
fn get_id(m: u64) -> u8 {
for id in range(0u8, 10) {
for id in 0u8..10 {
if m & (1 << (id + 50) as uint) != 0 {return id;}
}
panic!("{:016x} does not have a valid identifier", m);
@ -222,7 +222,7 @@ fn to_vec(raw_sol: &List<u64>) -> Vec<u8> {
let mut sol = repeat('.' as u8).take(50).collect::<Vec<_>>();
for &m in raw_sol.iter() {
let id = '0' as u8 + get_id(m);
for i in range(0u, 50) {
for i in 0u..50 {
if m & 1 << i != 0 {
sol[i] = id;
}

View file

@ -102,7 +102,7 @@ struct Planet {
}
fn advance(bodies: &mut [Planet;N_BODIES], dt: f64, steps: int) {
for _ in range(0, steps) {
for _ in 0..steps {
let mut b_slice = bodies.as_mut_slice();
loop {
let bi = match shift_mut_ref(&mut b_slice) {

View file

@ -77,7 +77,7 @@ fn stress_task(id: int) {
fn stress(num_tasks: int) {
let mut results = Vec::new();
for i in range(0, num_tasks) {
for i in 0..num_tasks {
results.push(Thread::scoped(move|| {
stress_task(i);
}));
@ -106,8 +106,8 @@ fn main() {
let num_trials = 10;
for n in range(1, max + 1) {
for _ in range(0u, num_trials) {
for n in 1..max + 1 {
for _ in 0u..num_trials {
let mut fibn = None;
let dur = Duration::span(|| fibn = Some(fib(n)));
let fibn = fibn.unwrap();

View file

@ -68,7 +68,7 @@ fn spectralnorm(n: uint) -> f64 {
let mut u = repeat(1.0).take(n).collect::<Vec<_>>();
let mut v = u.clone();
let mut tmp = v.clone();
for _ in range(0u, 10) {
for _ in 0u..10 {
mult_AtAv(u.as_slice(), v.as_mut_slice(), tmp.as_mut_slice());
mult_AtAv(v.as_slice(), u.as_mut_slice(), tmp.as_mut_slice());
}

View file

@ -15,13 +15,13 @@ use std::os;
use std::time::Duration;
fn append_sequential(min: uint, max: uint, map: &mut VecMap<uint>) {
for i in range(min, max) {
for i in min..max {
map.insert(i, i + 22u);
}
}
fn check_sequential(min: uint, max: uint, map: &VecMap<uint>) {
for i in range(min, max) {
for i in min..max {
assert_eq!(map[i], i + 22u);
}
}
@ -41,7 +41,7 @@ fn main() {
let mut checkf = Duration::seconds(0);
let mut appendf = Duration::seconds(0);
for _ in range(0u, rep) {
for _ in 0u..rep {
let mut map = VecMap::new();
let d1 = Duration::span(|| append_sequential(0u, max, &mut map));
let d2 = Duration::span(|| check_sequential(0u, max, &map));

View file

@ -81,9 +81,9 @@ impl Sudoku {
}
pub fn write(&self, writer: &mut old_io::Writer) {
for row in range(0u8, 9u8) {
for row in 0u8..9u8 {
write!(writer, "{}", self.grid[row as uint][0]);
for col in range(1u8, 9u8) {
for col in 1u8..9u8 {
write!(writer, " {}", self.grid[row as uint][col as uint]);
}
write!(writer, "\n");
@ -93,8 +93,8 @@ impl Sudoku {
// solve sudoku grid
pub fn solve(&mut self) {
let mut work: Vec<(u8, u8)> = Vec::new(); /* queue of uncolored fields */
for row in range(0u8, 9u8) {
for col in range(0u8, 9u8) {
for row in 0u8..9u8 {
for col in 0u8..9u8 {
let color = self.grid[row as uint][col as uint];
if color == 0u8 {
work.push((row, col));
@ -139,7 +139,7 @@ impl Sudoku {
// find colors available in neighbourhood of (row, col)
fn drop_colors(&mut self, avail: &mut Colors, row: u8, col: u8) {
for idx in range(0u8, 9u8) {
for idx in 0u8..9u8 {
/* check same column fields */
avail.remove(self.grid[idx as uint][col as uint]);
/* check same row fields */
@ -149,8 +149,8 @@ impl Sudoku {
// check same block fields
let row0 = (row / 3u8) * 3u8;
let col0 = (col / 3u8) * 3u8;
for alt_row in range(row0, row0 + 3u8) {
for alt_col in range(col0, col0 + 3u8) {
for alt_row in row0..row0 + 3u8 {
for alt_col in col0..col0 + 3u8 {
avail.remove(self.grid[alt_row as uint][alt_col as uint]);
}
}

View file

@ -30,7 +30,7 @@ fn main() {
}
fn run(repeat: int, depth: int) {
for _ in range(0, repeat) {
for _ in 0..repeat {
let dur = Duration::span(|| {
let _ = Thread::scoped(move|| {
recurse_or_panic(depth, None)

View file

@ -41,7 +41,7 @@ fn block_overarching_alias_mut() {
let mut v = box 3;
let mut x = &mut v;
for _ in range(0is, 3) {
for _ in 0is..3 {
borrow(&*v); //~ ERROR cannot borrow
}
*x = box 5;

View file

@ -13,7 +13,7 @@ macro_rules! foo {
}
pub fn main() {
'x: for _ in range(0,1) {
'x: for _ in 0..1 {
foo!() //~ ERROR use of undeclared label `'x`
};
}

View file

@ -9,7 +9,7 @@
// except according to those terms.
macro_rules! foo {
($e: expr) => { 'x: for _ in range(0,1) { $e } }
($e: expr) => { 'x: for _ in 0..1 { $e } }
}
pub fn main() {

View file

@ -18,7 +18,7 @@
macro_rules! f { () => (n) }
fn main() -> (){
for n in range(0is, 1) {
for n in 0is..1 {
println!("{}", f!()); //~ ERROR unresolved name `n`
}
}

View file

@ -12,7 +12,7 @@
#![feature(core)]
fn main() {
for _ in range(1is, 101) {
for _ in 1is..101 {
let x = (); //~ ERROR: unused variable: `x`
match () {
a => {} //~ ERROR: unused variable: `a`

View file

@ -85,7 +85,7 @@ fn f4b() -> isize {
}
fn f5a() {
for x in range(1is, 10) { }
for x in 1is..10 { }
//~^ ERROR unused variable: `x`
}

View file

@ -202,7 +202,7 @@ fn main() {
zzz(); // #break
}
for i in range(1234, 1235i) {
for i in 1234..1235i {
zzz(); // #break
}

View file

@ -49,7 +49,7 @@ fn some_function(a: int, b: int) {
let some_variable = Struct { a: 11, b: 22 };
let some_other_variable = 23i;
for x in range(0, 1) {
for x in 0..1 {
zzz(); // #break
}
}

View file

@ -62,7 +62,7 @@ fn after_break() {
}
fn after_continue() {
for _ in range(0, 10i32) {
for _ in 0..10i32 {
break;
let x = "0";
let (ref y,z) = (1i32, 2u32);

View file

@ -41,7 +41,7 @@ fn count(n: uint) -> uint {
}
fn main() {
for _ in range(0, 10u) {
for _ in 0..10u {
task::spawn(move|| {
let result = count(5u);
println!("result = %?", result);

View file

@ -10,4 +10,4 @@
// error-pattern:moop
fn main() { for _ in range(0u, 10u) { panic!("moop"); } }
fn main() { for _ in 0u..10u { panic!("moop"); } }

View file

@ -43,11 +43,11 @@ fn main() {
.write_str("mod unicode_input_multiple_files_chars;");
}
for _ in range(0u, 100) {
for _ in 0u..100 {
{
let randoms = tmpdir.join("unicode_input_multiple_files_chars.rs");
let mut w = File::create(&randoms).unwrap();
for _ in range(0u, 30) {
for _ in 0u..30 {
let _ = w.write_char(random_char());
}
}

View file

@ -38,7 +38,7 @@ fn main() {
let tmpdir = Path::new(args[2].as_slice());
let main_file = tmpdir.join("span_main.rs");
for _ in range(0u, 100) {
for _ in 0u..100 {
let n = thread_rng().gen_range(3u, 20);
{

View file

@ -77,7 +77,7 @@ fn runtest(me: &str) {
assert!(!out.status.success());
let s = str::from_utf8(out.error.as_slice()).unwrap();
let mut i = 0;
for _ in range(0i, 2) {
for _ in 0i..2 {
i += s[i + 10..].find_str("stack backtrace").unwrap() + 10;
}
assert!(s[i + 10..].find_str("stack backtrace").is_none(),

View file

@ -22,5 +22,5 @@ fn bitv_test() {
}
pub fn main() {
for _ in range(0i, 10000) { bitv_test(); }
for _ in 0i..10000 { bitv_test(); }
}

View file

@ -88,7 +88,7 @@ fn cat(in_x: uint, in_y: int, in_name: String) -> cat {
fn annoy_neighbors(critter: &mut noisy) {
for _i in range(0u, 10) { critter.speak(); }
for _i in 0u..10 { critter.speak(); }
}
pub fn main() {

View file

@ -103,11 +103,11 @@ impl<T> cat<T> {
pub fn main() {
let mut nyan: cat<String> = cat::new(0, 2, "nyan".to_string());
for _ in range(1u, 5) { nyan.speak(); }
for _ in 1u..5 { nyan.speak(); }
assert!(*nyan.find(&1).unwrap() == "nyan".to_string());
assert_eq!(nyan.find(&10), None);
let mut spotty: cat<cat_type> = cat::new(2, 57, cat_type::tuxedo);
for _ in range(0u, 6) { spotty.speak(); }
for _ in 0u..6 { spotty.speak(); }
assert_eq!(spotty.len(), 8);
assert!((spotty.contains_key(&2)));
assert_eq!(spotty.get(&3), &cat_type::tuxedo);

View file

@ -60,6 +60,6 @@ pub fn main() {
let mut nyan = cat(0u, 2, "nyan".to_string());
nyan.eat();
assert!((!nyan.eat()));
for _ in range(1u, 10u) { nyan.speak(); };
for _ in 1u..10u { nyan.speak(); };
assert!((nyan.eat()));
}

View file

@ -65,7 +65,7 @@ pub fn main() {
let mut nyan = cat(0u, 2, "nyan".to_string());
nyan.eat();
assert!((!nyan.eat()));
for _ in range(1u, 10u) {
for _ in 1u..10u {
make_speak(nyan.clone());
}
}

View file

@ -16,6 +16,6 @@ pub fn main() {
let mut nyan = cat(0u, 2, "nyan".to_string());
nyan.eat();
assert!((!nyan.eat()));
for _ in range(1u, 10u) { nyan.speak(); };
for _ in 1u..10u { nyan.speak(); };
assert!((nyan.eat()));
}

View file

@ -52,6 +52,6 @@ pub fn main() {
let mut nyan = cat(0u, 2, "nyan".to_string());
nyan.eat();
assert!((!nyan.eat()));
for _ in range(1u, 10u) { nyan.speak(); };
for _ in 1u..10u { nyan.speak(); };
assert!((nyan.eat()));
}

View file

@ -71,7 +71,7 @@ pub fn main() {
roundtrip::<C>();
roundtrip::<D>();
for _ in range(0, 20) {
for _ in 0..20 {
roundtrip::<E>();
roundtrip::<F>();
roundtrip::<G<int>>();

View file

@ -31,7 +31,7 @@ enum D {
pub fn main() {
// check there's no segfaults
for _ in range(0i, 20) {
for _ in 0i..20 {
rand::random::<A>();
rand::random::<B>();
rand::random::<C>();

View file

@ -27,7 +27,7 @@ macro_rules! while_true {
macro_rules! run_once {
($e: expr) => {
// ditto
'x: for _ in range(0i, 1) { $e }
'x: for _ in 0i..1 { $e }
}
}
@ -45,7 +45,7 @@ pub fn main() {
assert_eq!(j, 1i);
let k: int = {
'x: for _ in range(0i, 1) {
'x: for _ in 0i..1 {
// ditto
loop_x!(break 'x);
i += 1;
@ -55,7 +55,7 @@ pub fn main() {
assert_eq!(k, 1i);
let l: int = {
'x: for _ in range(0i, 1) {
'x: for _ in 0i..1 {
// ditto
while_true!(break 'x);
i += 1;
@ -65,7 +65,7 @@ pub fn main() {
assert_eq!(l, 1i);
let n: int = {
'x: for _ in range(0i, 1) {
'x: for _ in 0i..1 {
// ditto
run_once!(continue 'x);
i += 1;

View file

@ -18,7 +18,7 @@ macro_rules! loop_x {
macro_rules! run_once {
($e: expr) => {
// ditto
'x: for _ in range(0i, 1) { $e }
'x: for _ in 0i..1 { $e }
}
}
@ -30,7 +30,7 @@ macro_rules! while_x {
}
pub fn main() {
'x: for _ in range(0i, 1) {
'x: for _ in 0i..1 {
// this 'x should refer to the outer loop, lexically
loop_x!(break 'x);
panic!("break doesn't act hygienically inside for loop");
@ -47,7 +47,7 @@ pub fn main() {
panic!("break doesn't act hygienically inside infinite while loop");
}
'x: for _ in range(0i, 1) {
'x: for _ in 0i..1 {
// ditto
run_once!(continue 'x);
panic!("continue doesn't act hygienically inside for loop");

View file

@ -19,10 +19,10 @@ pub fn main () {
let args = os::args();
let args = args.as_slice();
if args.len() > 1 && args[1].as_slice() == "child" {
for _ in range(0i, 1000i) {
for _ in 0i..1000i {
println!("hello?");
}
for _ in range(0i, 1000i) {
for _ in 0i..1000i {
println!("hello?");
}
return;

View file

@ -18,7 +18,7 @@ fn main() {
let n = 1000000u;
let mut sieve = Bitv::from_elem(n+1, true);
let limit: uint = (n as f32).sqrt() as uint;
for i in range(2, limit+1) {
for i in 2..limit+1 {
if sieve[i] {
let mut j = 0;
while i*i + j*i <= n {
@ -27,7 +27,7 @@ fn main() {
}
}
}
for i in range(2, n+1) {
for i in 2..n+1 {
if sieve[i] {
}
}

View file

@ -24,7 +24,7 @@ fn main() {
let (tx, rx) = channel();
let _t = Thread::spawn(move|| { helper(rx) });
let (snd, rcv) = channel::<int>();
for _ in range(1i, 100000i) {
for _ in 1i..100000i {
snd.send(1i).unwrap();
let (tx2, rx2) = channel();
tx.send(tx2).unwrap();

View file

@ -35,7 +35,7 @@ pub fn main() {
let bools = vec!(false, false, true, false, false, true, true, false);
let bools2 = to_bools(Storage{storage: vec!(0b01100100)});
for i in range(0u, 8) {
for i in 0u..8 {
println!("{} => {} vs {}", i, bools[i], bools2[i]);
}

View file

@ -10,7 +10,7 @@
pub fn main() {
let mut x = 0i;
for _ in range(0i, 4096) { x += 1; }
for _ in 0i..4096 { x += 1; }
assert_eq!(x, 4096);
println!("x = {}", x);
}

View file

@ -69,7 +69,7 @@ fn AsciiArt(width: uint, height: uint, fill: char) -> AsciiArt {
// Use an anonymous function to build a vector of vectors containing
// blank characters for each position in our canvas.
let mut lines = Vec::new();
for _ in range(0, height) {
for _ in 0..height {
lines.push(repeat('.').take(width).collect::<Vec<_>>());
}
@ -136,13 +136,13 @@ impl Canvas for AsciiArt {
fn add_rect(&mut self, shape: Rect) {
// Add the top and bottom lines.
for x in range(shape.top_left.x, shape.top_left.x + shape.size.width) {
for x in shape.top_left.x..shape.top_left.x + shape.size.width {
self.add_pt(x, shape.top_left.y);
self.add_pt(x, shape.top_left.y + shape.size.height - 1);
}
// Add the left and right lines.
for y in range(shape.top_left.y, shape.top_left.y + shape.size.height) {
for y in shape.top_left.y..shape.top_left.y + shape.size.height {
self.add_pt(shape.top_left.x, y);
self.add_pt(shape.top_left.x + shape.size.width - 1, y);
}

View file

@ -44,7 +44,7 @@ priv fn parse_data(len: uint, io: @io::Reader) -> Result {
priv fn parse_list(len: uint, io: @io::Reader) -> Result {
let mut list: ~[Result] = ~[];
for _ in range(0, len) {
for _ in 0..len {
let v = match io.read_char() {
'$' => parse_bulk(io),
':' => parse_int(io),

View file

@ -10,7 +10,7 @@
pub fn main() {
let mut count = 0i;
for _ in range(0i, 999_999) { count += 1; }
for _ in 0i..999_999 { count += 1; }
assert_eq!(count, 999_999);
println!("{}", count);
}

View file

@ -16,7 +16,7 @@ trait Fooable {
impl Fooable for uint {
fn yes(self) {
for _ in range(0, self) { println!("yes"); }
for _ in 0..self { println!("yes"); }
}
}

View file

@ -15,7 +15,7 @@ fn periodical(n: int) -> Receiver<bool> {
let (chan, port) = channel();
Thread::spawn(move|| {
loop {
for _ in range(1, n) {
for _ in 1..n {
match chan.send(false) {
Ok(()) => {}
Err(..) => break,
@ -49,7 +49,7 @@ fn main() {
let ints = integers();
let threes = periodical(3);
let fives = periodical(5);
for _ in range(1i, 100i) {
for _ in 1i..100i {
match (ints.recv().unwrap(), threes.recv().unwrap(), fives.recv().unwrap()) {
(_, true, true) => println!("FizzBuzz"),
(_, true, false) => println!("Fizz"),

View file

@ -15,7 +15,7 @@ pub fn main() {
}
}
'bar: for _ in range(0i, 100i) {
'bar: for _ in 0i..100i {
loop {
break 'bar;
}

View file

@ -27,7 +27,7 @@ fn test(x: bool, foo: Box<Triple>) -> int {
pub fn main() {
let x = box Triple{x: 1, y: 2, z: 3};
for _ in range(0u, 10000u) {
for _ in 0u..10000u {
assert_eq!(test(true, x.clone()), 2);
}
assert_eq!(test(false, x), 5);

View file

@ -24,7 +24,7 @@ pub fn main() {
assert_eq!(mem::size_of::<[Foo; 10]>(), 90);
for i in range(0u, 10) {
for i in 0u..10 {
assert_eq!(foos[i], Foo { bar: 1, baz: 2});
}

View file

@ -16,7 +16,7 @@ fn foo(src: uint) {
match Some(src) {
Some(src_id) => {
for _i in range(0u, 10u) {
for _i in 0u..10u {
let yyy = src_id;
assert_eq!(yyy, 0u);
}

View file

@ -22,7 +22,7 @@ impl cat {
}
impl cat {
fn nap(&mut self) { for _ in range(1u, 10u) { } }
fn nap(&mut self) { for _ in 1u..10u { } }
}
fn cat(in_x : uint, in_y : int) -> cat {

View file

@ -35,9 +35,9 @@ unsafe fn test_triangle() -> bool {
// from pairs of rows (where each pair of rows is equally sized),
// and the elements of the triangle match their row-pair index.
unsafe fn sanity_check(ascend: &[*mut u8]) {
for i in range(0u, COUNT / 2) {
for i in 0u..COUNT / 2 {
let (p0, p1, size) = (ascend[2*i], ascend[2*i+1], idx_to_size(i));
for j in range(0u, size) {
for j in 0u..size {
assert_eq!(*p0.offset(j as int), i as u8);
assert_eq!(*p1.offset(j as int), i as u8);
}
@ -88,16 +88,16 @@ unsafe fn test_triangle() -> bool {
// that at least two rows will be allocated near each other, so
// that we trigger the bug (a buffer overrun) in an observable
// way.)
for i in range(0u, COUNT / 2) {
for i in 0u..COUNT / 2 {
let size = idx_to_size(i);
ascend[2*i] = allocate(size, ALIGN);
ascend[2*i+1] = allocate(size, ALIGN);
}
// Initialize each pair of rows to distinct value.
for i in range(0u, COUNT / 2) {
for i in 0u..COUNT / 2 {
let (p0, p1, size) = (ascend[2*i], ascend[2*i+1], idx_to_size(i));
for j in range(0, size) {
for j in 0..size {
*p0.offset(j as int) = i as u8;
*p1.offset(j as int) = i as u8;
}
@ -109,7 +109,7 @@ unsafe fn test_triangle() -> bool {
test_3(ascend); // triangle -> square
test_4(ascend); // square -> triangle
for i in range(0u, COUNT / 2) {
for i in 0u..COUNT / 2 {
let size = idx_to_size(i);
deallocate(ascend[2*i], size, ALIGN);
deallocate(ascend[2*i+1], size, ALIGN);
@ -123,7 +123,7 @@ unsafe fn test_triangle() -> bool {
// rows as we go.
unsafe fn test_1(ascend: &mut [*mut u8]) {
let new_size = idx_to_size(COUNT-1);
for i in range(0u, COUNT / 2) {
for i in 0u..COUNT / 2 {
let (p0, p1, old_size) = (ascend[2*i], ascend[2*i+1], idx_to_size(i));
assert!(old_size < new_size);
@ -138,7 +138,7 @@ unsafe fn test_triangle() -> bool {
// Test 2: turn the square back into a triangle, top to bottom.
unsafe fn test_2(ascend: &mut [*mut u8]) {
let old_size = idx_to_size(COUNT-1);
for i in range(0u, COUNT / 2) {
for i in 0u..COUNT / 2 {
let (p0, p1, new_size) = (ascend[2*i], ascend[2*i+1], idx_to_size(i));
assert!(new_size < old_size);

View file

@ -13,7 +13,7 @@ use std::mem::swap;
pub fn main() {
let mut x = 4;
for i in range(0u, 3) {
for i in 0u..3 {
// ensure that the borrow in this alt
// does not interfere with the swap
// below. note that it would it you

View file

@ -20,7 +20,7 @@ pub fn main() {
Err(..) => unreachable!(),
Ok(f) => {
let mut f = f;
for _ in range(0u, 1000) {
for _ in 0u..1000 {
f.write(&[0]);
}
}

View file

@ -58,7 +58,7 @@ fn test() {
let _t = (0..N).map(|_| {
let cli_tx = cli_tx.clone();
Thread::scoped(move|| {
for _ in range(0, M) {
for _ in 0..M {
let _s = TcpStream::connect(addr).unwrap();
}
cli_tx.send(());

View file

@ -41,7 +41,7 @@ fn eventual_timeout() {
rx1.recv().unwrap();
let mut v = Vec::new();
for _ in range(0u, 10000) {
for _ in 0u..10000 {
match TcpStream::connect_timeout(addr, Duration::milliseconds(100)) {
Ok(e) => v.push(e),
Err(ref e) if e.kind == old_io::TimedOut => return,

View file

@ -51,7 +51,7 @@ fn main() {
let addr = rx.recv().unwrap();
let (tx, rx) = channel();
for _ in range(0u, 1000) {
for _ in 0u..1000 {
let tx = tx.clone();
Builder::new().stack_size(64 * 1024).spawn(move|| {
match TcpStream::connect(addr) {
@ -70,7 +70,7 @@ fn main() {
// Wait for all clients to exit, but don't wait for the server to exit. The
// server just runs infinitely.
drop(tx);
for _ in range(0u, 1000) {
for _ in 0u..1000 {
rx.recv().unwrap();
}
unsafe { libc::exit(0) }

View file

@ -31,7 +31,7 @@ pub fn main() {
}).collect::<Vec<_>>();
let mut actual = 0u;
for _ in range(0u, n) {
for _ in 0u..n {
let j = rx.recv().unwrap();
actual += *j;
}

View file

@ -55,8 +55,8 @@ impl Drop for DropCounter {
pub fn main() {
assert!(MAX_LEN <= std::uint::BITS);
// len can't go above 64.
for len in range(2, MAX_LEN) {
for _ in range(0, REPEATS) {
for len in 2..MAX_LEN {
for _ in 0..REPEATS {
// reset the count for these new DropCounters, so their
// IDs start from 0.
creation_count.store(0, Ordering::Relaxed);
@ -71,7 +71,7 @@ pub fn main() {
main.clone().as_mut_slice().sort_by(|a, b| { count += 1; a.cmp(b) });
// ... and then panic on each and every single one.
for panic_countdown in range(0i, count) {
for panic_countdown in 0i..count {
// refresh the counters.
for c in drop_counts.iter() {
c.store(0, Ordering::Relaxed);