Skip to content

Commit aa33ecf

Browse files
committed
---
yaml --- r: 42863 b: refs/heads/try c: 793f20a h: refs/heads/master i: 42861: b187d8d 42859: 938b61c 42855: 8d899bf 42847: 0f3aa37 v: v3
1 parent 479e138 commit aa33ecf

File tree

3 files changed

+1
-29
lines changed

3 files changed

+1
-29
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 19dfec2aaf746535de1521f68421f9980dbf25de
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
5-
refs/heads/try: a9587b8fcd3e436cf2e4a25997e6eecc4608235b
5+
refs/heads/try: 793f20ad327f08a59dea5f67cd07ffddf9679d15
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278

branches/try/src/libstd/comm.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,6 @@ use core::pipes;
2323
use core::prelude::*;
2424

2525
/// An extension of `pipes::stream` that allows both sending and receiving.
26-
#[cfg(stage0)]
27-
pub struct DuplexStream<T:Owned, U:Owned> {
28-
priv chan: Chan<T>,
29-
priv port: Port<U>,
30-
}
31-
#[cfg(stage1)]
32-
#[cfg(stage2)]
3326
pub struct DuplexStream<T, U> {
3427
priv chan: Chan<T>,
3528
priv port: Port<U>,

branches/try/src/libstd/workcache.rs

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -167,20 +167,6 @@ struct Database {
167167
}
168168

169169
impl Database {
170-
#[cfg(stage0)]
171-
#[cfg(stage1)]
172-
fn prepare(&mut self, fn_name: &str,
173-
declared_inputs: &WorkMap) -> Option<(WorkMap, WorkMap, ~str)>
174-
{
175-
let k = json_encode(&(fn_name, declared_inputs));
176-
let db_cache = copy self.db_cache;
177-
match db_cache.find(&k) {
178-
None => None,
179-
Some(&v) => Some(json_decode(copy v))
180-
}
181-
}
182-
183-
#[cfg(stage2)]
184170
fn prepare(&mut self, fn_name: &str,
185171
declared_inputs: &WorkMap) -> Option<(WorkMap, WorkMap, ~str)>
186172
{
@@ -235,13 +221,6 @@ struct Exec {
235221
discovered_outputs: WorkMap
236222
}
237223
238-
#[cfg(stage0)]
239-
struct Work<T:Owned> {
240-
prep: @Mut<Prep>,
241-
res: Option<Either<T,PortOne<(Exec,T)>>>
242-
}
243-
#[cfg(stage1)]
244-
#[cfg(stage2)]
245224
struct Work<T> {
246225
prep: @Mut<Prep>,
247226
res: Option<Either<T,PortOne<(Exec,T)>>>

0 commit comments

Comments
 (0)