Skip to content

Commit 485ad4e

Browse files
committed
---
yaml --- r: 57839 b: refs/heads/incoming c: a2493ad h: refs/heads/master i: 57837: 09227d9 57835: e66b61d 57831: 599a904 57823: ac25a9a v: v3
1 parent 83aaf13 commit 485ad4e

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: bf67eb2362b7d0f37012f2d6dac604c3bbacd2c6
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/incoming: cdd342bd34a7036cf1ddf3f6832c73fa018f305b
9+
refs/heads/incoming: a2493ad04811c1133127be8740bf30c2d24504ab
1010
refs/heads/dist-snap: 00dbbd01c2aee72982b3e0f9511ae1d4428c3ba9
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libsyntax/ext/base.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -461,9 +461,7 @@ impl <K: Eq + Hash + IterBytes ,V: Copy> MapChain<K,V>{
461461

462462
// ugh: can't get this to compile with mut because of the
463463
// lack of flow sensitivity.
464-
#[cfg(stage1)]
465-
#[cfg(stage2)]
466-
#[cfg(stage3)]
464+
#[cfg(not(stage0))]
467465
fn get_map<'a>(&'a self) -> &'a HashMap<K,@V> {
468466
match *self {
469467
BaseMapChain (~ref map) => map,

branches/incoming/src/libsyntax/opt_vec.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,7 @@ impl<T> OptVec<T> {
6868
}
6969
}
7070

71-
#[cfg(stage1)]
72-
#[cfg(stage2)]
73-
#[cfg(stage3)]
71+
#[cfg(not(stage0))]
7472
fn get<'a>(&'a self, i: uint) -> &'a T {
7573
match *self {
7674
Empty => fail!(fmt!("Invalid index %u", i)),

0 commit comments

Comments
 (0)