auto merge of #12815 : alexcrichton/rust/chan-rename, r=brson

* Chan<T> => Sender<T>
* Port<T> => Receiver<T>
* 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

1 files changed, 5 insertions, 5 deletions

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();
         }
     }
 }