---

yaml
---
r: 35639
b: refs/heads/master
c: c14105b
h: refs/heads/master
i:
  35637: 2f597c1
  35635: eccf340
  35631: 7d62b9c
v: v3

Author: erickt

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 9c673b246c69d1cdcffbaf0e5cf012941b0b78e2
+refs/heads/master: c14105bb8a9a36428a67ac508464b54259675f69
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024

trunk/src/librustc/metadata/decoder.rs

@@ -25,7 +25,11 @@ use reader = std::ebml::reader;
 use std::ebml;
 use std::map::HashMap;
 use std::map;
+#[cfg(stage0)]
 use std::serialize::traits::Decodable;
+#[cfg(stage1)]
+#[cfg(stage2)]
+use std::serialize::Decodable;
 use syntax::ast_map;
 use syntax::attr;
 use syntax::diagnostic::span_handler;

trunk/src/librustc/middle/astencode.rs

@@ -29,7 +29,11 @@ use std::ebml;
 use std::map::HashMap;
 use std::serialize;
 use std::serialize::{Encodable, EncoderHelpers, DecoderHelpers};
+#[cfg(stage0)]
 use std::serialize::traits::Decodable;
+#[cfg(stage1)]
+#[cfg(stage2)]
+use std::serialize::Decodable;
 use syntax::ast;
 use syntax::ast_map;
 use syntax::ast_util;

trunk/src/libstd/ebml.rs

@@ -657,7 +657,7 @@ mod tests {
             };
             let ebml_doc = reader::Doc(@bytes);
             let deser = reader::Decoder(ebml_doc);
-            let v1 = serialize::traits::Decodable::decode(&deser);
+            let v1 = serialize::Decodable::decode(&deser);
             debug!("v1 == %?", v1);
             assert v == v1;
         }