Skip to content

Commit 93e99b8

Browse files
bytboxbytbox
committed
Remove do keyword from librustuv
1 parent 25e7e7f commit 93e99b8

File tree

8 files changed

+50
-50
lines changed

8 files changed

+50
-50
lines changed

‎src/librustuv/async.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,10 +152,10 @@ mod test_remote {
152152
let watcher = AsyncWatcher::new(&mut local_loop().loop_,
153153
cb as ~Callback);
154154

155-
let thread = do Thread::start {
155+
let thread = Thread::start(proc() {
156156
let mut watcher = watcher;
157157
watcher.fire();
158-
};
158+
});
159159

160160
assert_eq!(port.recv(), 1);
161161
thread.join();

‎src/librustuv/homing.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -170,14 +170,14 @@ mod test {
170170
event_loop_factory: None,
171171
});
172172

173-
do pool.spawn(TaskOpts::new()) {
173+
pool.spawn(TaskOpts::new(), proc() {
174174
let listener = UdpWatcher::bind(local_loop(), next_test_ip4());
175175
chan.send(listener.unwrap());
176-
}
176+
});
177177

178-
let task = do pool.task(TaskOpts::new()) {
178+
let task = pool.task(TaskOpts::new(), proc() {
179179
port.recv();
180-
};
180+
});
181181
pool.spawn_sched().send(sched::TaskFromFriend(task));
182182

183183
pool.shutdown();
@@ -191,20 +191,20 @@ mod test {
191191
event_loop_factory: None,
192192
});
193193

194-
do pool.spawn(TaskOpts::new()) {
194+
pool.spawn(TaskOpts::new(), proc() {
195195
let addr1 = next_test_ip4();
196196
let addr2 = next_test_ip4();
197197
let listener = UdpWatcher::bind(local_loop(), addr2);
198198
chan.send((listener.unwrap(), addr1));
199199
let mut listener = UdpWatcher::bind(local_loop(), addr1).unwrap();
200200
listener.sendto([1, 2, 3, 4], addr2);
201-
}
201+
});
202202

203-
let task = do pool.task(TaskOpts::new()) {
203+
let task = pool.task(TaskOpts::new(), proc() {
204204
let (mut watcher, addr) = port.recv();
205205
let mut buf = [0, ..10];
206206
assert_eq!(watcher.recvfrom(buf).unwrap(), (4, addr));
207-
};
207+
});
208208
pool.spawn_sched().send(sched::TaskFromFriend(task));
209209

210210
pool.shutdown();

‎src/librustuv/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -433,10 +433,10 @@ mod test {
433433

434434
#[test]
435435
fn loop_smoke_test() {
436-
do run_in_bare_thread {
436+
run_in_bare_thread(proc() {
437437
let mut loop_ = Loop::new();
438438
loop_.run();
439439
loop_.close();
440-
}
440+
});
441441
}
442442
}

‎src/librustuv/net.rs

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -692,7 +692,7 @@ mod test {
692692
let (port, chan) = Chan::new();
693693
let addr = next_test_ip4();
694694
695-
do spawn {
695+
spawn(proc() {
696696
let w = match TcpListener::bind(local_loop(), addr) {
697697
Ok(w) => w, Err(e) => fail!("{:?}", e)
698698
};
@@ -712,7 +712,7 @@ mod test {
712712
}
713713
Err(e) => fail!("{:?}", e)
714714
}
715-
}
715+
});
716716
717717
port.recv();
718718
let mut w = match TcpWatcher::connect(local_loop(), addr) {
@@ -728,7 +728,7 @@ mod test {
728728
let (port, chan) = Chan::new();
729729
let addr = next_test_ip6();
730730
731-
do spawn {
731+
spawn(proc() {
732732
let w = match TcpListener::bind(local_loop(), addr) {
733733
Ok(w) => w, Err(e) => fail!("{:?}", e)
734734
};
@@ -748,7 +748,7 @@ mod test {
748748
}
749749
Err(e) => fail!("{:?}", e)
750750
}
751-
}
751+
});
752752
753753
port.recv();
754754
let mut w = match TcpWatcher::connect(local_loop(), addr) {
@@ -765,7 +765,7 @@ mod test {
765765
let client = next_test_ip4();
766766
let server = next_test_ip4();
767767
768-
do spawn {
768+
spawn(proc() {
769769
match UdpWatcher::bind(local_loop(), server) {
770770
Ok(mut w) => {
771771
chan.send(());
@@ -780,7 +780,7 @@ mod test {
780780
}
781781
Err(e) => fail!("{:?}", e)
782782
}
783-
}
783+
});
784784
785785
port.recv();
786786
let mut w = match UdpWatcher::bind(local_loop(), client) {
@@ -797,7 +797,7 @@ mod test {
797797
let client = next_test_ip6();
798798
let server = next_test_ip6();
799799
800-
do spawn {
800+
spawn(proc() {
801801
match UdpWatcher::bind(local_loop(), server) {
802802
Ok(mut w) => {
803803
chan.send(());
@@ -812,7 +812,7 @@ mod test {
812812
}
813813
Err(e) => fail!("{:?}", e)
814814
}
815-
}
815+
});
816816
817817
port.recv();
818818
let mut w = match UdpWatcher::bind(local_loop(), client) {
@@ -829,7 +829,7 @@ mod test {
829829
static MAX: uint = 5000;
830830
let (port, chan) = Chan::new();
831831
832-
do spawn {
832+
spawn(proc() {
833833
let listener = TcpListener::bind(local_loop(), addr).unwrap();
834834
let mut acceptor = listener.listen().unwrap();
835835
chan.send(());
@@ -841,7 +841,7 @@ mod test {
841841
uvdebug!("wrote bytes");
842842
total_bytes_written += buf.len();
843843
}
844-
}
844+
});
845845
846846
port.recv();
847847
let mut stream = TcpWatcher::connect(local_loop(), addr).unwrap();
@@ -864,12 +864,12 @@ mod test {
864864
let client_addr = next_test_ip4();
865865
let (port, chan) = Chan::new();
866866

867-
do spawn {
867+
spawn(proc() {
868868
let mut client = UdpWatcher::bind(local_loop(), client_addr).unwrap();
869869
port.recv();
870870
assert!(client.sendto([1], server_addr).is_ok());
871871
assert!(client.sendto([2], server_addr).is_ok());
872-
}
872+
});
873873

874874
let mut server = UdpWatcher::bind(local_loop(), server_addr).unwrap();
875875
chan.send(());
@@ -896,7 +896,7 @@ mod test {
896896
let (p1, c1) = Chan::new();
897897
let (p2, c2) = Chan::new();
898898

899-
do spawn {
899+
spawn(proc() {
900900
let l = local_loop();
901901
let mut server_out = UdpWatcher::bind(l, server_out_addr).unwrap();
902902
let mut server_in = UdpWatcher::bind(l, server_in_addr).unwrap();
@@ -918,7 +918,7 @@ mod test {
918918
assert_eq!(src, client_out_addr);
919919
}
920920
assert!(total_bytes_sent >= MAX);
921-
}
921+
});
922922

923923
let l = local_loop();
924924
let mut client_out = UdpWatcher::bind(l, client_out_addr).unwrap();
@@ -950,7 +950,7 @@ mod test {
950950
let addr = next_test_ip4();
951951
let (port, chan) = Chan::<Port<()>>::new();
952952

953-
do spawn {
953+
spawn(proc() {
954954
let port2 = port.recv();
955955
let mut stream = TcpWatcher::connect(local_loop(), addr).unwrap();
956956
stream.write([0, 1, 2, 3, 4, 5, 6, 7]);
@@ -959,7 +959,7 @@ mod test {
959959
stream.write([0, 1, 2, 3, 4, 5, 6, 7]);
960960
stream.write([0, 1, 2, 3, 4, 5, 6, 7]);
961961
port2.recv();
962-
}
962+
});
963963

964964
let listener = TcpListener::bind(local_loop(), addr).unwrap();
965965
let mut acceptor = listener.listen().unwrap();
@@ -992,7 +992,7 @@ mod test {
992992
fn test_simple_tcp_server_and_client_on_diff_threads() {
993993
let addr = next_test_ip4();
994994

995-
do spawn {
995+
spawn(proc() {
996996
let listener = TcpListener::bind(local_loop(), addr).unwrap();
997997
let mut acceptor = listener.listen().unwrap();
998998
let mut stream = acceptor.accept().unwrap();
@@ -1002,7 +1002,7 @@ mod test {
10021002
for i in range(0u, nread) {
10031003
assert_eq!(buf[i], i as u8);
10041004
}
1005-
}
1005+
});
10061006

10071007
let mut stream = TcpWatcher::connect(local_loop(), addr);
10081008
while stream.is_err() {
@@ -1024,12 +1024,12 @@ mod test {
10241024
let (port, chan) = Chan::new();
10251025
let addr = next_test_ip4();
10261026

1027-
do spawn {
1027+
spawn(proc() {
10281028
let w = TcpListener::bind(local_loop(), addr).unwrap();
10291029
let mut w = w.listen().unwrap();
10301030
chan.send(());
10311031
w.accept();
1032-
}
1032+
});
10331033
port.recv();
10341034
let _w = TcpWatcher::connect(local_loop(), addr).unwrap();
10351035
fail!();
@@ -1050,10 +1050,10 @@ mod test {
10501050
// force the handle to be created on a different scheduler, failure in
10511051
// the original task will force a homing operation back to this
10521052
// scheduler.
1053-
do spawn {
1053+
spawn(proc() {
10541054
let w = UdpWatcher::bind(local_loop(), addr).unwrap();
10551055
chan.send(w);
1056-
}
1056+
});
10571057

10581058
let _w = port.recv();
10591059
fail!();

‎src/librustuv/pipe.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ mod tests {
278278
let path2 = path.clone();
279279
let (port, chan) = Chan::new();
280280

281-
do spawn {
281+
spawn(proc() {
282282
let p = PipeListener::bind(local_loop(), &path2.to_c_str()).unwrap();
283283
let mut p = p.listen().unwrap();
284284
chan.send(());
@@ -287,7 +287,7 @@ mod tests {
287287
assert!(client.read(buf).unwrap() == 1);
288288
assert_eq!(buf[0], 1);
289289
assert!(client.write([2]).is_ok());
290-
}
290+
});
291291
port.recv();
292292
let mut c = PipeWatcher::connect(local_loop(), &path.to_c_str()).unwrap();
293293
assert!(c.write([1]).is_ok());
@@ -302,12 +302,12 @@ mod tests {
302302
let path2 = path.clone();
303303
let (port, chan) = Chan::new();
304304

305-
do spawn {
305+
spawn(proc() {
306306
let p = PipeListener::bind(local_loop(), &path2.to_c_str()).unwrap();
307307
let mut p = p.listen().unwrap();
308308
chan.send(());
309309
p.accept();
310-
}
310+
});
311311
port.recv();
312312
let _c = PipeWatcher::connect(local_loop(), &path.to_c_str()).unwrap();
313313
fail!()

‎src/librustuv/signal.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ mod test {
8585
let _signal = SignalWatcher::new(local_loop(), signal::Interrupt,
8686
chan);
8787

88-
do spawn {
88+
spawn(proc() {
8989
port.try_recv();
90-
}
90+
});
9191

9292
// when we drop the SignalWatcher we're going to destroy the channel,
9393
// which must wake up the task on the other end

‎src/librustuv/timer.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -245,9 +245,9 @@ mod test {
245245
let mut timer = TimerWatcher::new(local_loop());
246246
let timer_port = timer.period(1000);
247247

248-
do spawn {
248+
spawn(proc() {
249249
timer_port.recv_opt();
250-
}
250+
});
251251

252252
// when we drop the TimerWatcher we're going to destroy the channel,
253253
// which must wake up the task on the other end
@@ -259,9 +259,9 @@ mod test {
259259
let mut timer = TimerWatcher::new(local_loop());
260260
let timer_port = timer.period(1000);
261261

262-
do spawn {
262+
spawn(proc() {
263263
timer_port.recv_opt();
264-
}
264+
});
265265

266266
timer.oneshot(1);
267267
}
@@ -271,9 +271,9 @@ mod test {
271271
let mut timer = TimerWatcher::new(local_loop());
272272
let timer_port = timer.period(1000);
273273

274-
do spawn {
274+
spawn(proc() {
275275
timer_port.recv_opt();
276-
}
276+
});
277277

278278
timer.sleep(1);
279279
}

‎src/librustuv/uvio.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,16 +111,16 @@ pub fn new_loop() -> ~rtio::EventLoop {
111111
#[test]
112112
fn test_callback_run_once() {
113113
use std::rt::rtio::EventLoop;
114-
do run_in_bare_thread {
114+
run_in_bare_thread(proc() {
115115
let mut event_loop = UvEventLoop::new();
116116
let mut count = 0;
117117
let count_ptr: *mut int = &mut count;
118-
do event_loop.callback {
118+
event_loop.callback(proc() {
119119
unsafe { *count_ptr += 1 }
120-
}
120+
});
121121
event_loop.run();
122122
assert_eq!(count, 1);
123-
}
123+
});
124124
}
125125

126126
pub struct UvIoFactory {

0 commit comments

Comments
 (0)