diff options
| author | Patrick Walton <pcwalton@mimiga.net> | 2013-01-08 19:37:25 -0800 |
|---|---|---|
| committer | Patrick Walton <pcwalton@mimiga.net> | 2013-01-08 22:02:35 -0800 |
| commit | 2db3abddcd6784dc5529081c6d831c972abbe755 (patch) | |
| tree | 0f18922234f5fce5fda2af3bdbd7ad4a03423ecd /src/libcore/pipes.rs | |
| parent | 3a5b64172045e7f1ec1981c8da2150c7feb73079 (diff) | |
librustc: Make unqualified identifier searches terminate at the nearest module scope. r=tjc
Diffstat (limited to 'src/libcore/pipes.rs')
| -rw-r--r-- | src/libcore/pipes.rs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/libcore/pipes.rs b/src/libcore/pipes.rs index a129a9f4c5a..260bc7e2476 100644 --- a/src/libcore/pipes.rs +++ b/src/libcore/pipes.rs @@ -90,11 +90,13 @@ bounded and unbounded protocols allows for less code duplication. use cmp::Eq; use cast::{forget, reinterpret_cast, transmute}; use either::{Either, Left, Right}; +use kinds::Owned; use libc; use option; use option::unwrap; use pipes; use ptr; +use prelude::*; use private; use task; use vec; @@ -1238,6 +1240,8 @@ pub fn try_send_one<T: Owned>(chan: ChanOne<T>, data: T) } pub mod rt { + use option::{None, Option, Some}; + // These are used to hide the option constructors from the // compiler because their names are changing pub fn make_some<T>(val: T) -> Option<T> { Some(move val) } @@ -1246,7 +1250,8 @@ pub mod rt { #[cfg(test)] pub mod test { - use pipes::oneshot; + use either::{Either, Left, Right}; + use pipes::{Chan, Port, oneshot, recv_one, stream}; use pipes; #[test] |
