3 files changed, 18 insertions, 18 deletions
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();
         }
     }
 }
diff --git a/src/libstd/sync/mpsc_queue.rs b/src/libstd/sync/mpsc_queue.rs
index 2dc63380cb8..9d69f2b3b08 100644
--- a/src/libstd/sync/mpsc_queue.rs
+++ b/src/libstd/sync/mpsc_queue.rs
@@ -176,17 +176,17 @@ mod tests {
             Empty => {}
             Inconsistent | Data(..) => fail!()
         }
-        let (port, chan) = Chan::new();
+        let (tx, rx) = channel();
         let q = UnsafeArc::new(q);
 
         for _ in range(0, nthreads) {
-            let chan = chan.clone();
+            let tx = tx.clone();
             let q = q.clone();
             native::task::spawn(proc() {
                 for i in range(0, nmsgs) {
                     unsafe { (*q.get()).push(i); }
                 }
-                chan.send(());
+                tx.send(());
             });
         }
 
@@ -197,9 +197,9 @@ mod tests {
                 Data(_) => { i += 1 }
             }
         }
-        drop(chan);
+        drop(tx);
         for _ in range(0, nthreads) {
-            port.recv();
+            rx.recv();
         }
     }
 }
diff --git a/src/libstd/sync/spsc_queue.rs b/src/libstd/sync/spsc_queue.rs
index a2c61a2b135..9277587e587 100644
--- a/src/libstd/sync/spsc_queue.rs
+++ b/src/libstd/sync/spsc_queue.rs
@@ -273,7 +273,7 @@ mod test {
 
         fn stress_bound(bound: uint) {
             let (a, b) = UnsafeArc::new2(Queue::new(bound));
-            let (port, chan) = Chan::new();
+            let (tx, rx) = channel();
             native::task::spawn(proc() {
                 for _ in range(0, 100000) {
                     loop {
@@ -284,12 +284,12 @@ mod test {
                         }
                     }
                 }
-                chan.send(());
+                tx.send(());
             });
             for _ in range(0, 100000) {
                 unsafe { (*a.get()).push(1); }
             }
-            port.recv();
+            rx.recv();
         }
     }
 }