auto merge of #9771 : alexcrichton/rust/snapshots, r=thestinger

Still building locally, we'll see if anything dies...
rust-lang · Oct 8, 2013 · 6db8899 · 6db8899
2 parents e42e322 + 0cca359
commit 6db8899
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 19 deletions.
diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs
@@ -499,30 +499,11 @@ fn mk_fresh_ident_interner() -> @ident_interner {
     @interner::StrInterner::prefill(init_vec)
 }
 
-// NOTE remove stage0 pub'ed special cases after next snapshot.
-#[cfg(stage0)]
-pub static SELF_KEYWORD_NAME: uint = 8;
-#[cfg(not(stage0))]
 static SELF_KEYWORD_NAME: uint = 8;
-#[cfg(stage0)]
-pub static STATIC_KEYWORD_NAME: uint = 27;
-#[cfg(not(stage0))]
 static STATIC_KEYWORD_NAME: uint = 27;
-#[cfg(stage0)]
-pub static STRICT_KEYWORD_START: uint = 32;
-#[cfg(not(stage0))]
 static STRICT_KEYWORD_START: uint = 32;
-#[cfg(stage0)]
-pub static STRICT_KEYWORD_FINAL: uint = 64;
-#[cfg(not(stage0))]
 static STRICT_KEYWORD_FINAL: uint = 64;
-#[cfg(stage0)]
-pub static RESERVED_KEYWORD_START: uint = 65;
-#[cfg(not(stage0))]
 static RESERVED_KEYWORD_START: uint = 65;
-#[cfg(stage0)]
-pub static RESERVED_KEYWORD_FINAL: uint = 71;
-#[cfg(not(stage0))]
 static RESERVED_KEYWORD_FINAL: uint = 71;
 
 // if an interner exists in TLS, return it. Otherwise, prepare a

diff --git a/src/snapshots.txt b/src/snapshots.txt
@@ -1,3 +1,11 @@
+S 2013-10-07 c919629
+  freebsd-x86_64 c9af0c52bdcc1ffe2db4c9a3a1aaae66ff7fcc2c
+  linux-i386 0245cb9e57c9b39f3441e9768256783ba76be6e7
+  linux-x86_64 483d9bd109316e647a11d387653568d95e3581e6
+  macos-i386 c12154816a8f5cd7b2c758250859cf6abf3eddbf
+  macos-x86_64 9d46c31618a3bbd6ddffa598f1350e16c620621b
+  winnt-i386 b111d291a15ff7f02aba9c59bb81ae7a3cd86628
+
 S 2013-10-04 8bb55db
   freebsd-x86_64 8b68b99033e68f5d98e3e3d077de9d2e085be1ba
   linux-i386 10bc0069efdca378155640963d70d3a08a7248dc