diff options
| author | Daniel Micay <danielmicay@gmail.com> | 2013-08-03 12:45:23 -0400 |
|---|---|---|
| committer | Daniel Micay <danielmicay@gmail.com> | 2013-08-03 22:48:02 -0400 |
| commit | 10089455287dcc3652b984ab4bfd6971e1b5f302 (patch) | |
| tree | a9570eacf4ff89a1f14b7380c080af77918589f6 /src/libstd/rt | |
| parent | 9f74217d80290d1cb36afcaf68a566b4b4907d27 (diff) | |
| download | rust-10089455287dcc3652b984ab4bfd6971e1b5f302.tar.gz rust-10089455287dcc3652b984ab4bfd6971e1b5f302.zip | |
remove obsolete `foreach` keyword
this has been replaced by `for`
Diffstat (limited to 'src/libstd/rt')
| -rw-r--r-- | src/libstd/rt/args.rs | 2 | ||||
| -rw-r--r-- | src/libstd/rt/borrowck.rs | 2 | ||||
| -rw-r--r-- | src/libstd/rt/io/net/tcp.rs | 8 | ||||
| -rw-r--r-- | src/libstd/rt/mod.rs | 4 | ||||
| -rw-r--r-- | src/libstd/rt/sched.rs | 4 | ||||
| -rw-r--r-- | src/libstd/rt/select.rs | 14 | ||||
| -rw-r--r-- | src/libstd/rt/test.rs | 8 | ||||
| -rw-r--r-- | src/libstd/rt/tube.rs | 2 | ||||
| -rw-r--r-- | src/libstd/rt/uv/net.rs | 8 | ||||
| -rw-r--r-- | src/libstd/rt/uv/uvio.rs | 10 |
10 files changed, 31 insertions, 31 deletions
diff --git a/src/libstd/rt/args.rs b/src/libstd/rt/args.rs index e701cb64fb6..6f26e3bd9ef 100644 --- a/src/libstd/rt/args.rs +++ b/src/libstd/rt/args.rs @@ -112,7 +112,7 @@ mod imp { // Copied from `os`. unsafe fn load_argc_and_argv(argc: int, argv: **u8) -> ~[~str] { let mut args = ~[]; - foreach i in range(0u, argc as uint) { + for i in range(0u, argc as uint) { args.push(str::raw::from_c_str(*(argv as **libc::c_char).offset(i as int))); } args diff --git a/src/libstd/rt/borrowck.rs b/src/libstd/rt/borrowck.rs index bb66a901234..dcfcc3a9fc6 100644 --- a/src/libstd/rt/borrowck.rs +++ b/src/libstd/rt/borrowck.rs @@ -83,7 +83,7 @@ unsafe fn fail_borrowed(box: *mut raw::Box<()>, file: *c_char, line: size_t) { Some(borrow_list) => { // recording borrows let mut msg = ~"borrowed"; let mut sep = " at "; - foreach entry in borrow_list.rev_iter() { + for entry in borrow_list.rev_iter() { if entry.box == box { msg.push_str(sep); let filename = str::raw::from_c_str(entry.file); diff --git a/src/libstd/rt/io/net/tcp.rs b/src/libstd/rt/io/net/tcp.rs index 764ef283eb8..780aa9cb75c 100644 --- a/src/libstd/rt/io/net/tcp.rs +++ b/src/libstd/rt/io/net/tcp.rs @@ -421,7 +421,7 @@ mod test { do spawntask { let mut listener = TcpListener::bind(addr); - foreach i in range(0, MAX) { + for i in range(0, MAX) { let stream = Cell::new(listener.accept()); rtdebug!("accepted"); // Start another task to handle the connection @@ -460,7 +460,7 @@ mod test { do spawntask { let mut listener = TcpListener::bind(addr); - foreach i in range(0, MAX) { + for i in range(0, MAX) { let stream = Cell::new(listener.accept()); rtdebug!("accepted"); // Start another task to handle the connection @@ -499,7 +499,7 @@ mod test { do spawntask { let mut listener = TcpListener::bind(addr); - foreach _ in range(0, MAX) { + for _ in range(0, MAX) { let stream = Cell::new(listener.accept()); rtdebug!("accepted"); // Start another task to handle the connection @@ -537,7 +537,7 @@ mod test { do spawntask { let mut listener = TcpListener::bind(addr); - foreach _ in range(0, MAX) { + for _ in range(0, MAX) { let stream = Cell::new(listener.accept()); rtdebug!("accepted"); // Start another task to handle the connection diff --git a/src/libstd/rt/mod.rs b/src/libstd/rt/mod.rs index f0f4b646103..4cfe0efacfe 100644 --- a/src/libstd/rt/mod.rs +++ b/src/libstd/rt/mod.rs @@ -303,7 +303,7 @@ fn run_(main: ~fn(), use_main_sched: bool) -> int { let on_exit: ~fn(bool) = |exit_success| { let mut handles = handles.take(); - foreach handle in handles.mut_iter() { + for handle in handles.mut_iter() { handle.send(Shutdown); } @@ -379,7 +379,7 @@ fn run_(main: ~fn(), use_main_sched: bool) -> int { rtdebug!("waiting for threads"); // Wait for schedulers - foreach thread in threads.consume_iter() { + for thread in threads.consume_iter() { thread.join(); } diff --git a/src/libstd/rt/sched.rs b/src/libstd/rt/sched.rs index dfe003253c2..18cfeade157 100644 --- a/src/libstd/rt/sched.rs +++ b/src/libstd/rt/sched.rs @@ -761,7 +761,7 @@ mod test { let mut task_run_count = 0; let task_run_count_ptr: *mut uint = &mut task_run_count; do run_in_newsched_task || { - foreach _ in range(0u, total) { + for _ in range(0u, total) { do spawntask || { unsafe { *task_run_count_ptr = *task_run_count_ptr + 1}; } @@ -960,7 +960,7 @@ mod test { #[test] fn test_stress_schedule_task_states() { let n = stress_factor() * 120; - foreach _ in range(0, n as int) { + for _ in range(0, n as int) { test_schedule_home_states(); } } diff --git a/src/libstd/rt/select.rs b/src/libstd/rt/select.rs index a5adb25b526..006b777b71b 100644 --- a/src/libstd/rt/select.rs +++ b/src/libstd/rt/select.rs @@ -37,7 +37,7 @@ pub fn select<A: Select>(ports: &mut [A]) -> uint { fail!("can't select on an empty list"); } - foreach (index, port) in ports.mut_iter().enumerate() { + for (index, port) in ports.mut_iter().enumerate() { if port.optimistic_check() { return index; } @@ -53,7 +53,7 @@ pub fn select<A: Select>(ports: &mut [A]) -> uint { do sched.deschedule_running_task_and_then |sched, task| { let task_handles = task.make_selectable(ports.len()); - foreach (index, (port, task_handle)) in + for (index, (port, task_handle)) in ports.mut_iter().zip(task_handles.consume_iter()).enumerate() { // If one of the ports has data by now, it will wake the handle. if port.block_on(sched, task_handle) { @@ -66,7 +66,7 @@ pub fn select<A: Select>(ports: &mut [A]) -> uint { // Task resumes. Now unblock ourselves from all the ports we blocked on. // If the success index wasn't reset, 'take' will just take all of them. // Iterate in reverse so the 'earliest' index that's ready gets returned. - foreach (index, port) in ports.mut_slice(0, ready_index).mut_rev_iter().enumerate() { + for (index, port) in ports.mut_slice(0, ready_index).mut_rev_iter().enumerate() { if port.unblock_from() { ready_index = index; } @@ -128,7 +128,7 @@ mod test { let (ports, chans) = unzip(from_fn(num_ports, |_| oneshot::<()>())); let mut dead_chans = ~[]; let mut ports = ports; - foreach (i, chan) in chans.consume_iter().enumerate() { + for (i, chan) in chans.consume_iter().enumerate() { if send_on_chans.contains(&i) { chan.send(()); } else { @@ -145,7 +145,7 @@ mod test { let (ports, chans) = unzip(from_fn(num_ports, |_| stream::<()>())); let mut dead_chans = ~[]; let mut ports = ports; - foreach (i, chan) in chans.consume_iter().enumerate() { + for (i, chan) in chans.consume_iter().enumerate() { if send_on_chans.contains(&i) { chan.send(()); } else { @@ -192,7 +192,7 @@ mod test { let mut ports = ports; let mut port = Some(port); let order = [5u,0,4,3,2,6,9,8,7,1]; - foreach &index in order.iter() { + for &index in order.iter() { // put the port in the vector at any index util::swap(port.get_mut_ref(), &mut ports[index]); assert!(select(ports) == index); @@ -272,7 +272,7 @@ mod test { let send_on_chans = send_on_chans.clone(); do task::spawn { let mut ports = ~[]; - foreach i in range(0u, NUM_CHANS) { + for i in range(0u, NUM_CHANS) { let (p,c) = oneshot(); ports.push(p); if send_on_chans.contains(&i) { diff --git a/src/libstd/rt/test.rs b/src/libstd/rt/test.rs index 66ae085b1a0..2d45b1cd139 100644 --- a/src/libstd/rt/test.rs +++ b/src/libstd/rt/test.rs @@ -169,7 +169,7 @@ pub fn run_in_mt_newsched_task(f: ~fn()) { let mut handles = ~[]; let mut scheds = ~[]; - foreach _ in range(0u, nthreads) { + for _ in range(0u, nthreads) { let loop_ = ~UvEventLoop::new(); let mut sched = ~Scheduler::new(loop_, work_queue.clone(), @@ -184,7 +184,7 @@ pub fn run_in_mt_newsched_task(f: ~fn()) { let on_exit: ~fn(bool) = |exit_status| { let mut handles = handles.take(); // Tell schedulers to exit - foreach handle in handles.mut_iter() { + for handle in handles.mut_iter() { handle.send(Shutdown); } @@ -223,7 +223,7 @@ pub fn run_in_mt_newsched_task(f: ~fn()) { } // Wait for schedulers - foreach thread in threads.consume_iter() { + for thread in threads.consume_iter() { thread.join(); } } @@ -346,7 +346,7 @@ fn base_port() -> uint { let mut final_base = base; - foreach &(dir, base) in bases.iter() { + for &(dir, base) in bases.iter() { if path.contains(dir) { final_base = base; break; diff --git a/src/libstd/rt/tube.rs b/src/libstd/rt/tube.rs index c014d0abda2..247893f75de 100644 --- a/src/libstd/rt/tube.rs +++ b/src/libstd/rt/tube.rs @@ -166,7 +166,7 @@ mod test { sched.enqueue_blocked_task(task); } - foreach i in range(0, MAX) { + for i in range(0, MAX) { let j = tube.recv(); assert!(j == i); } diff --git a/src/libstd/rt/uv/net.rs b/src/libstd/rt/uv/net.rs index 773adb3848a..5ac9f52f335 100644 --- a/src/libstd/rt/uv/net.rs +++ b/src/libstd/rt/uv/net.rs @@ -701,7 +701,7 @@ mod test { if status.is_none() { rtdebug!("got %d bytes", nread); let buf = buf.unwrap(); - foreach byte in buf.slice(0, nread as uint).iter() { + for byte in buf.slice(0, nread as uint).iter() { assert!(*byte == count as u8); rtdebug!("%u", *byte as uint); count += 1; @@ -777,7 +777,7 @@ mod test { rtdebug!("got %d bytes", nread); let buf = buf.unwrap(); let r = buf.slice(0, nread as uint); - foreach byte in r.iter() { + for byte in r.iter() { assert!(*byte == count as u8); rtdebug!("%u", *byte as uint); count += 1; @@ -848,7 +848,7 @@ mod test { rtdebug!("got %d bytes", nread); let buf = buf.unwrap(); - foreach &byte in buf.slice(0, nread as uint).iter() { + for &byte in buf.slice(0, nread as uint).iter() { assert!(byte == count as u8); rtdebug!("%u", byte as uint); count += 1; @@ -908,7 +908,7 @@ mod test { rtdebug!("got %d bytes", nread); let buf = buf.unwrap(); - foreach &byte in buf.slice(0, nread as uint).iter() { + for &byte in buf.slice(0, nread as uint).iter() { assert!(byte == count as u8); rtdebug!("%u", byte as uint); count += 1; diff --git a/src/libstd/rt/uv/uvio.rs b/src/libstd/rt/uv/uvio.rs index e15e3adb8c9..5c17aea9341 100644 --- a/src/libstd/rt/uv/uvio.rs +++ b/src/libstd/rt/uv/uvio.rs @@ -843,7 +843,7 @@ fn test_simple_tcp_server_and_client() { let mut buf = [0, .. 2048]; let nread = stream.read(buf).unwrap(); assert_eq!(nread, 8); - foreach i in range(0u, nread) { + for i in range(0u, nread) { rtdebug!("%u", buf[i] as uint); assert_eq!(buf[i], i as u8); } @@ -873,7 +873,7 @@ fn test_simple_udp_server_and_client() { let mut buf = [0, .. 2048]; let (nread,src) = server_socket.recvfrom(buf).unwrap(); assert_eq!(nread, 8); - foreach i in range(0u, nread) { + for i in range(0u, nread) { rtdebug!("%u", buf[i] as uint); assert_eq!(buf[i], i as u8); } @@ -908,7 +908,7 @@ fn test_read_and_block() { while current < expected { let nread = stream.read(buf).unwrap(); - foreach i in range(0u, nread) { + for i in range(0u, nread) { let val = buf[i] as uint; assert_eq!(val, current % 8); current += 1; @@ -973,7 +973,7 @@ fn test_read_read_read() { let nread = stream.read(buf).unwrap(); rtdebug!("read %u bytes", nread as uint); total_bytes_read += nread; - foreach i in range(0u, nread) { + for i in range(0u, nread) { assert_eq!(buf[i], 1); } } @@ -1065,7 +1065,7 @@ fn test_udp_many_read() { let (nread, src) = res.unwrap(); assert_eq!(src, server_out_addr); total_bytes_recv += nread; - foreach i in range(0u, nread) { + for i in range(0u, nread) { assert_eq!(buf[i], 1); } } |
