---

yaml
---
r: 65017
b: refs/heads/snap-stage3
c: def8891
h: refs/heads/master
i:
  65015: 6590576
v: v3

Author: omasanori

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 682939724f83e3368d3b58ff99e7bf8fd9ff5960
+refs/heads/snap-stage3: def88913d80e153d956ce85f8155d77455bcfe5e
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libextra/flatpipes.rs

@@ -633,16 +633,12 @@ pub mod bytepipes {
 #[cfg(test)]
 mod test {
 
-    use flatpipes::{Flattener, Unflattener};
-    use flatpipes::bytepipes::*;
+    use flatpipes::BytePort;
     use flatpipes::pod;
     use flatpipes::serial;
     use io_util::BufReader;
-    use flatpipes::{BytePort, FlatChan, FlatPort};
 
-    use std::comm;
     use std::io::BytesWriter;
-    use std::result;
     use std::task;
 
     #[test]
@@ -727,7 +723,11 @@ mod test {
 
     // FIXME #2064: Networking doesn't work on x86
     // XXX Broken until networking support is added back
-    /*#[test]
+    /*
+    use flatpipes::{Flattener, Unflattener, FlatChan, FlatPort};
+    use flatpipes::bytepipes::*;
+
+    #[test]
     #[cfg(target_arch = "x86_64")]
     fn test_pod_tcp_stream() {
         fn reader_port(buf: TcpSocketBuf
@@ -767,6 +767,8 @@ mod test {
         port: uint) {
 
         use std::cell::Cell;
+        use std::comm;
+        use std::result;
         use net::ip;
         use net::tcp;
         use uv;