auto merge of #4867 : z0w0/rust/pruneprelude, r=catamorphism

4 files changed, 4 insertions, 4 deletions

diff --git a/src/libcore/prelude.rs b/src/libcore/prelude.rs
index a798d8c866a..9cf683fb9b6 100644
--- a/src/libcore/prelude.rs
+++ b/src/libcore/prelude.rs
@@ -34,7 +34,6 @@ pub use path::GenericPath;
 pub use path::Path;
 pub use path::PosixPath;
 pub use path::WindowsPath;
-pub use pipes::{GenericChan, GenericPort};
 pub use ptr::Ptr;
 pub use str::{StrSlice, Trimmable, OwnedStr};
 pub use to_bytes::IterBytes;
diff --git a/src/libcore/private.rs b/src/libcore/private.rs
index 56e3325edba..6864572adff 100644
--- a/src/libcore/private.rs
+++ b/src/libcore/private.rs
@@ -14,7 +14,7 @@ use cast;
 use iter;
 use libc;
 use option;
-use pipes;
+use pipes::{GenericChan, GenericPort};
 use prelude::*;
 use ptr;
 use result;
diff --git a/src/libcore/private/weak_task.rs b/src/libcore/private/weak_task.rs
index 9d57cd5a466..e330bda0a61 100644
--- a/src/libcore/private/weak_task.rs
+++ b/src/libcore/private/weak_task.rs
@@ -22,7 +22,8 @@ use option::{Some, None, swap_unwrap};
 use private::at_exit::at_exit;
 use private::global::global_data_clone_create;
 use private::finally::Finally;
-use pipes::{Port, Chan, SharedChan, GenericSmartChan, stream};
+use pipes::{Port, Chan, SharedChan, GenericChan, GenericPort,
+            GenericSmartChan, stream};
 use task::{Task, task, spawn};
 use task::rt::{task_id, get_task_id};
 use hashmap::linear::LinearMap;
diff --git a/src/libcore/run.rs b/src/libcore/run.rs
index 43ecf350ff3..ae5c4d19b1c 100644
--- a/src/libcore/run.rs
+++ b/src/libcore/run.rs
@@ -14,7 +14,7 @@ use io;
 use io::ReaderUtil;
 use libc;
 use libc::{pid_t, c_void, c_int};
-use pipes::{stream, SharedChan};
+use pipes::{stream, SharedChan, GenericChan, GenericPort};
 use option::{Some, None};
 use os;
 use prelude::*;