auto merge of #11081 : alexcrichton/rust/comm-adapters, r=huonw

I accidentally removed this module from compilation awhile back, this adds it
back in.

Closes #11076

2 files changed, 5 insertions, 2 deletions

diff --git a/src/libstd/io/comm_adapters.rs b/src/libstd/io/comm_adapters.rs
index 7f94af8307e..7a78800c33d 100644
--- a/src/libstd/io/comm_adapters.rs
+++ b/src/libstd/io/comm_adapters.rs
@@ -38,7 +38,7 @@ pub struct PortReader {
 }
 
 impl PortReader {
-    pub fn new(port: Port<~[u8]>) -> PortReader<P> {
+    pub fn new(port: Port<~[u8]>) -> PortReader {
         PortReader {
             buf: None,
             pos: 0,
@@ -94,7 +94,7 @@ pub struct ChanWriter {
 }
 
 impl ChanWriter {
-    pub fn new(chan: C) -> ChanWriter<C> {
+    pub fn new(chan: Chan<~[u8]>) -> ChanWriter {
         ChanWriter { chan: chan }
     }
 }
diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs
index 2e9056a6aee..239c6bc6a08 100644
--- a/src/libstd/io/mod.rs
+++ b/src/libstd/io/mod.rs
@@ -335,6 +335,9 @@ pub mod signal;
 /// Utility implementations of Reader and Writer
 pub mod util;
 
+/// Adapatation of Chan/Port types to a Writer/Reader type.
+pub mod comm_adapters;
+
 /// The default buffer size for various I/O operations
 static DEFAULT_BUF_SIZE: uint = 1024 * 64;