From 78580651131c9daacd7e5e4669af819cdd719f09 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Sun, 9 Mar 2014 14:58:32 -0700 Subject: std: Rename Chan/Port types and constructor * Chan => Sender * Port => Receiver * Chan::new() => channel() * constructor returns (Sender, Receiver) instead of (Receiver, Sender) * local variables named `port` renamed to `rx` * local variables named `chan` renamed to `tx` Closes #11765 --- src/libstd/sync/mpmc_bounded_queue.rs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/libstd/sync/mpmc_bounded_queue.rs') diff --git a/src/libstd/sync/mpmc_bounded_queue.rs b/src/libstd/sync/mpmc_bounded_queue.rs index 44825a1ef94..ad0434c634a 100644 --- a/src/libstd/sync/mpmc_bounded_queue.rs +++ b/src/libstd/sync/mpmc_bounded_queue.rs @@ -172,24 +172,24 @@ mod tests { let nmsgs = 1000u; let mut q = Queue::with_capacity(nthreads*nmsgs); assert_eq!(None, q.pop()); - let (port, chan) = Chan::new(); + let (tx, rx) = channel(); for _ in range(0, nthreads) { let q = q.clone(); - let chan = chan.clone(); + let tx = tx.clone(); native::task::spawn(proc() { let mut q = q; for i in range(0, nmsgs) { assert!(q.push(i)); } - chan.send(()); + tx.send(()); }); } - let mut completion_ports = ~[]; + let mut completion_rxs = ~[]; for _ in range(0, nthreads) { - let (completion_port, completion_chan) = Chan::new(); - completion_ports.push(completion_port); + let (tx, rx) = channel(); + completion_rxs.push(rx); let q = q.clone(); native::task::spawn(proc() { let mut q = q; @@ -203,15 +203,15 @@ mod tests { } } } - completion_chan.send(i); + tx.send(i); }); } - for completion_port in completion_ports.mut_iter() { - assert_eq!(nmsgs, completion_port.recv()); + for rx in completion_rxs.mut_iter() { + assert_eq!(nmsgs, rx.recv()); } for _ in range(0, nthreads) { - port.recv(); + rx.recv(); } } } -- cgit 1.4.1-3-g733a5