---

yaml
---
r: 39624
b: refs/heads/incoming
c: 31b07ae
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: f67c37263e9dd625ab7f91c661464b5f14a584af
+refs/heads/incoming: 31b07ae8c5e068850b76dae1c0e9dc502046870f
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/test/run-pass/pipe-pingpong-bounded.rs

@@ -19,15 +19,14 @@
 // modified in hopefully straightforward ways.
 mod pingpong {
     use core::pipes::*;
+    use core::ptr;
 
-    type packets = {
-        // This is probably a resolve bug, I forgot to export packet,
-        // but since I didn't import pipes::*, it worked anyway.
+    pub type packets = {
         ping: Packet<ping>,
         pong: Packet<pong>,
     };
 
-    fn init() -> (client::ping, server::ping) {
+    pub fn init() -> (client::ping, server::ping) {
         let buffer = ~{
             header: BufferHeader(),
             data: {
@@ -44,44 +43,48 @@ mod pingpong {
     pub enum ping = server::pong;
     pub enum pong = client::ping;
     pub mod client {
+        use core::ptr;
+
         pub fn ping(+pipe: ping) -> pong {
             {
                 let b = pipe.reuse_buffer();
                 let s = SendPacketBuffered(ptr::addr_of(&(b.buffer.data.pong)));
                 let c = RecvPacketBuffered(ptr::addr_of(&(b.buffer.data.pong)));
-                let message = pingpong::ping(move s);
-                pipes::send(move pipe, move message);
+                let message = ::pingpong::ping(move s);
+                ::pipes::send(move pipe, move message);
                 move c
             }
         }
-        pub type ping = pipes::SendPacketBuffered<pingpong::ping,
-        pingpong::packets>;
-        pub type pong = pipes::RecvPacketBuffered<pingpong::pong,
-        pingpong::packets>;
+        pub type ping = pipes::SendPacketBuffered<::pingpong::ping,
+                                                  ::pingpong::packets>;
+        pub type pong = pipes::RecvPacketBuffered<::pingpong::pong,
+                                                  ::pingpong::packets>;
     }
     pub mod server {
-        pub type ping = pipes::RecvPacketBuffered<pingpong::ping,
-        pingpong::packets>;
+        use core::ptr;
+
+        pub type ping = pipes::RecvPacketBuffered<::pingpong::ping,
+        ::pingpong::packets>;
         pub fn pong(+pipe: pong) -> ping {
             {
                 let b = pipe.reuse_buffer();
                 let s = SendPacketBuffered(ptr::addr_of(&(b.buffer.data.ping)));
                 let c = RecvPacketBuffered(ptr::addr_of(&(b.buffer.data.ping)));
-                let message = pingpong::pong(move s);
-                pipes::send(move pipe, move message);
+                let message = ::pingpong::pong(move s);
+                ::pipes::send(move pipe, move message);
                 move c
             }
         }
-        pub type pong = pipes::SendPacketBuffered<pingpong::pong,
-        pingpong::packets>;
+        pub type pong = pipes::SendPacketBuffered<::pingpong::pong,
+                                                  ::pingpong::packets>;
     }
 }
 
 mod test {
     use pipes::recv;
     use pingpong::{ping, pong};
 
-    pub fn client(-chan: pingpong::client::ping) {
+    pub fn client(-chan: ::pingpong::client::ping) {
         use pingpong::client;
 
         let chan = client::ping(move chan); return;
@@ -90,7 +93,7 @@ mod test {
         log(error, "Received pong");
     }
 
-    pub fn server(-chan: pingpong::server::ping) {
+    pub fn server(-chan: ::pingpong::server::ping) {
         use pingpong::server;
 
         let ping(chan) = recv(move chan); return;
@@ -101,7 +104,7 @@ mod test {
 }
 
 fn main() {
-    let (client_, server_) = pingpong::init();
+    let (client_, server_) = ::pingpong::init();
     let client_ = ~mut Some(move client_);
     let server_ = ~mut Some(move server_);
     do task::spawn |move client_| {