diff options
| author | Patrick Walton <pcwalton@mimiga.net> | 2013-05-07 11:38:08 -0700 |
|---|---|---|
| committer | Patrick Walton <pcwalton@mimiga.net> | 2013-05-08 17:04:00 -0700 |
| commit | 99daec602fc8fa4612320c7c1babe6ae8717759c (patch) | |
| tree | 472ee0fe27d7d50f48d58b2e60339180c07848df /src/libstd/future.rs | |
| parent | 278b487cabcbe52b301a8023cd1362045b1a7132 (diff) | |
| download | rust-99daec602fc8fa4612320c7c1babe6ae8717759c.tar.gz rust-99daec602fc8fa4612320c7c1babe6ae8717759c.zip | |
librustc: Fix merge fallout.
Diffstat (limited to 'src/libstd/future.rs')
| -rw-r--r-- | src/libstd/future.rs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/libstd/future.rs b/src/libstd/future.rs index 209859e3096..eea9d56c975 100644 --- a/src/libstd/future.rs +++ b/src/libstd/future.rs @@ -28,6 +28,13 @@ use core::pipes::recv; use core::task; #[doc = "The future type"] +#[cfg(stage0)] +pub struct Future<A> { + priv mut state: FutureState<A>, +} + +#[doc = "The future type"] +#[cfg(not(stage0))] pub struct Future<A> { priv state: FutureState<A>, } |