diff options
| author | bors <bors@rust-lang.org> | 2013-05-20 02:46:36 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-05-20 02:46:36 -0700 |
| commit | 2e6cda254a2acdcd60efb62a27f69c7702b8f71e (patch) | |
| tree | ba2b843a8a0cd261cf94b4e6ab017d0918841f3c /src/libcore/rt | |
| parent | ab46a38039c320bd2011160fdd8a86828172d29e (diff) | |
| parent | 66319b027888ceddf024a5919e007caceaf369f3 (diff) | |
| download | rust-2e6cda254a2acdcd60efb62a27f69c7702b8f71e.tar.gz rust-2e6cda254a2acdcd60efb62a27f69c7702b8f71e.zip | |
auto merge of #6635 : brson/rust/snapshot, r=brson
Diffstat (limited to 'src/libcore/rt')
| -rw-r--r-- | src/libcore/rt/comm.rs | 7 | ||||
| -rw-r--r-- | src/libcore/rt/io/mod.rs | 8 |
2 files changed, 0 insertions, 15 deletions
diff --git a/src/libcore/rt/comm.rs b/src/libcore/rt/comm.rs index 4b5732b2d3a..93afbea8278 100644 --- a/src/libcore/rt/comm.rs +++ b/src/libcore/rt/comm.rs @@ -22,9 +22,6 @@ use ops::Drop; use kinds::Owned; use rt::sched::Coroutine; use rt::local_sched; -#[cfg(stage0)] -use unstable::intrinsics::{atomic_xchg}; -#[cfg(not(stage0))] use unstable::intrinsics::{atomic_xchg, atomic_load}; use util::Void; use comm::{GenericChan, GenericSmartChan, GenericPort, Peekable}; @@ -210,10 +207,6 @@ impl<T> PortOne<T> { } impl<T> Peekable<T> for PortOne<T> { - #[cfg(stage0)] - fn peek(&self) -> bool { fail!() } - - #[cfg(not(stage0))] fn peek(&self) -> bool { unsafe { let packet: *mut Packet<T> = self.inner.packet(); diff --git a/src/libcore/rt/io/mod.rs b/src/libcore/rt/io/mod.rs index 802e069a738..0ec51a3aa94 100644 --- a/src/libcore/rt/io/mod.rs +++ b/src/libcore/rt/io/mod.rs @@ -253,18 +253,13 @@ pub use self::stdio::println; pub use self::file::FileStream; pub use self::net::ip::IpAddr; -#[cfg(not(stage0))] pub use self::net::tcp::TcpListener; -#[cfg(not(stage0))] pub use self::net::tcp::TcpStream; pub use self::net::udp::UdpStream; // Some extension traits that all Readers and Writers get. -#[cfg(not(stage0))] // Requires condition! fixes pub use self::extensions::ReaderUtil; -#[cfg(not(stage0))] // Requires condition! fixes pub use self::extensions::ReaderByteConversions; -#[cfg(not(stage0))] // Requires condition! fixes pub use self::extensions::WriterByteConversions; /// Synchronous, non-blocking file I/O. @@ -272,7 +267,6 @@ pub mod file; /// Synchronous, non-blocking network I/O. pub mod net { - #[cfg(not(stage0))] pub mod tcp; pub mod udp; pub mod ip; @@ -288,7 +282,6 @@ pub mod mem; pub mod stdio; /// Implementations for Option -#[cfg(not(stage0))] // Requires condition! fixes mod option; /// Basic stream compression. XXX: Belongs with other flate code @@ -298,7 +291,6 @@ pub mod flate; pub mod comm_adapters; /// Extension traits -#[cfg(not(stage0))] // Requires condition! fixes mod extensions; /// Non-I/O things needed by the I/O module |