Skip to content

Commit c14105b

Browse files
committed
Remove serialize::traits submodule.
1 parent 9c673b2 commit c14105b

File tree

6 files changed

+613
-4
lines changed

6 files changed

+613
-4
lines changed

src/librustc/metadata/decoder.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@ use reader = std::ebml::reader;
2525
use std::ebml;
2626
use std::map::HashMap;
2727
use std::map;
28+
#[cfg(stage0)]
2829
use std::serialize::traits::Decodable;
30+
#[cfg(stage1)]
31+
#[cfg(stage2)]
32+
use std::serialize::Decodable;
2933
use syntax::ast_map;
3034
use syntax::attr;
3135
use syntax::diagnostic::span_handler;

src/librustc/middle/astencode.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,11 @@ use std::ebml;
2929
use std::map::HashMap;
3030
use std::serialize;
3131
use std::serialize::{Encodable, EncoderHelpers, DecoderHelpers};
32+
#[cfg(stage0)]
3233
use std::serialize::traits::Decodable;
34+
#[cfg(stage1)]
35+
#[cfg(stage2)]
36+
use std::serialize::Decodable;
3337
use syntax::ast;
3438
use syntax::ast_map;
3539
use syntax::ast_util;

src/libstd/ebml.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,7 @@ mod tests {
657657
};
658658
let ebml_doc = reader::Doc(@bytes);
659659
let deser = reader::Decoder(ebml_doc);
660-
let v1 = serialize::traits::Decodable::decode(&deser);
660+
let v1 = serialize::Decodable::decode(&deser);
661661
debug!("v1 == %?", v1);
662662
assert v == v1;
663663
}

0 commit comments

Comments
 (0)