auto merge of #13188 : FlaPer87/rust/master, r=alexcrichton

1 files changed, 0 insertions, 18 deletions

diff --git a/src/libsyntax/codemap.rs b/src/libsyntax/codemap.rs
index f3ff7f97ee2..974868c1610 100644
--- a/src/libsyntax/codemap.rs
+++ b/src/libsyntax/codemap.rs
@@ -110,23 +110,6 @@ impl Eq for Span {
 
 impl TotalEq for Span {}
 
-// FIXME: remove stage0 Encodables/Decodables after snapshot
-#[cfg(stage0)]
-impl<S:Encoder> Encodable<S> for Span {
-    /* Note #1972 -- spans are encoded but not decoded */
-    fn encode(&self, s: &mut S) {
-        s.emit_nil()
-    }
-}
-
-#[cfg(stage0)]
-impl<D:Decoder> Decodable<D> for Span {
-    fn decode(_d: &mut D) -> Span {
-        DUMMY_SP
-    }
-}
-
-#[cfg(not(stage0))]
 impl<S:Encoder<E>, E> Encodable<S, E> for Span {
     /* Note #1972 -- spans are encoded but not decoded */
     fn encode(&self, s: &mut S) -> Result<(), E> {
@@ -134,7 +117,6 @@ impl<S:Encoder<E>, E> Encodable<S, E> for Span {
     }
 }
 
-#[cfg(not(stage0))]
 impl<D:Decoder<E>, E> Decodable<D, E> for Span {
     fn decode(_d: &mut D) -> Result<Span, E> {
         Ok(DUMMY_SP)