Skip to content

Commit 6db8899

Browse files
committedOct 8, 2013
auto merge of #9771 : alexcrichton/rust/snapshots, r=thestinger
Still building locally, we'll see if anything dies...
2 parents e42e322 + 0cca359 commit 6db8899

File tree

2 files changed

+8
-19
lines changed

2 files changed

+8
-19
lines changed
 

‎src/libsyntax/parse/token.rs

-19
Original file line numberDiff line numberDiff line change
@@ -499,30 +499,11 @@ fn mk_fresh_ident_interner() -> @ident_interner {
499499
@interner::StrInterner::prefill(init_vec)
500500
}
501501

502-
// NOTE remove stage0 pub'ed special cases after next snapshot.
503-
#[cfg(stage0)]
504-
pub static SELF_KEYWORD_NAME: uint = 8;
505-
#[cfg(not(stage0))]
506502
static SELF_KEYWORD_NAME: uint = 8;
507-
#[cfg(stage0)]
508-
pub static STATIC_KEYWORD_NAME: uint = 27;
509-
#[cfg(not(stage0))]
510503
static STATIC_KEYWORD_NAME: uint = 27;
511-
#[cfg(stage0)]
512-
pub static STRICT_KEYWORD_START: uint = 32;
513-
#[cfg(not(stage0))]
514504
static STRICT_KEYWORD_START: uint = 32;
515-
#[cfg(stage0)]
516-
pub static STRICT_KEYWORD_FINAL: uint = 64;
517-
#[cfg(not(stage0))]
518505
static STRICT_KEYWORD_FINAL: uint = 64;
519-
#[cfg(stage0)]
520-
pub static RESERVED_KEYWORD_START: uint = 65;
521-
#[cfg(not(stage0))]
522506
static RESERVED_KEYWORD_START: uint = 65;
523-
#[cfg(stage0)]
524-
pub static RESERVED_KEYWORD_FINAL: uint = 71;
525-
#[cfg(not(stage0))]
526507
static RESERVED_KEYWORD_FINAL: uint = 71;
527508

528509
// if an interner exists in TLS, return it. Otherwise, prepare a

‎src/snapshots.txt

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
S 2013-10-07 c919629
2+
freebsd-x86_64 c9af0c52bdcc1ffe2db4c9a3a1aaae66ff7fcc2c
3+
linux-i386 0245cb9e57c9b39f3441e9768256783ba76be6e7
4+
linux-x86_64 483d9bd109316e647a11d387653568d95e3581e6
5+
macos-i386 c12154816a8f5cd7b2c758250859cf6abf3eddbf
6+
macos-x86_64 9d46c31618a3bbd6ddffa598f1350e16c620621b
7+
winnt-i386 b111d291a15ff7f02aba9c59bb81ae7a3cd86628
8+
19
S 2013-10-04 8bb55db
210
freebsd-x86_64 8b68b99033e68f5d98e3e3d077de9d2e085be1ba
311
linux-i386 10bc0069efdca378155640963d70d3a08a7248dc

0 commit comments

Comments
 (0)
Please sign in to comment.