From e2f97f51ad4cf902e5a5835b5332447fe59089c4 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Tue, 6 Jan 2015 09:24:46 -0800
Subject: Register new snapshots

Conflicts:
	src/librbml/lib.rs
	src/libserialize/json_stage0.rs
	src/libserialize/serialize_stage0.rs
	src/libsyntax/ast.rs
	src/libsyntax/ext/deriving/generic/mod.rs
	src/libsyntax/parse/token.rs
---
 src/libsyntax/parse/mod.rs   |  3 +--
 src/libsyntax/parse/token.rs | 17 -----------------
 2 files changed, 1 insertion(+), 19 deletions(-)

(limited to 'src/libsyntax/parse')

diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs
index 82e2c8136a4..3335566801a 100644
--- a/src/libsyntax/parse/mod.rs
+++ b/src/libsyntax/parse/mod.rs
@@ -24,8 +24,7 @@ use std::num::Int;
 use std::str;
 use std::iter;
 
-#[cfg_attr(stage0, macro_escape)]
-#[cfg_attr(not(stage0), macro_use)]
+#[macro_use]
 pub mod parser;
 
 pub mod lexer;
diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs
index 306ab303411..bdf96104697 100644
--- a/src/libsyntax/parse/token.rs
+++ b/src/libsyntax/parse/token.rs
@@ -684,29 +684,12 @@ impl<'a> PartialEq<InternedString > for &'a str {
     }
 }
 
-#[cfg(stage0)]
-impl<D:Decoder<E>, E> Decodable<D, E> for InternedString {
-    fn decode(d: &mut D) -> Result<InternedString, E> {
-        Ok(get_name(get_ident_interner().intern(
-                    try!(d.read_str()).index(&FullRange))))
-    }
-}
-
-#[cfg(not(stage0))]
 impl Decodable for InternedString {
     fn decode<D: Decoder>(d: &mut D) -> Result<InternedString, D::Error> {
         Ok(get_name(get_ident_interner().intern(try!(d.read_str()).index(&FullRange))))
     }
 }
 
-#[cfg(stage0)]
-impl<S:Encoder<E>, E> Encodable<S, E> for InternedString {
-    fn encode(&self, s: &mut S) -> Result<(), E> {
-        s.emit_str(self.string.index(&FullRange))
-    }
-}
-
-#[cfg(not(stage0))]
 impl Encodable for InternedString {
     fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
         s.emit_str(self.string.index(&FullRange))
-- 
cgit 1.4.1-3-g733a5