diff options
| author | Tim Chevalier <chevalier@alum.wellesley.edu> | 2012-06-06 14:19:52 -0700 |
|---|---|---|
| committer | Tim Chevalier <chevalier@alum.wellesley.edu> | 2012-06-06 15:08:24 -0700 |
| commit | a6c92f0a179c4f048aaa5145c438611175b41a0d (patch) | |
| tree | 3de35115d0abe3408b87f378d403c15765c775dd /src/rustc/metadata | |
| parent | cba77ffbfa469727314f65405117277839a1783b (diff) | |
| download | rust-a6c92f0a179c4f048aaa5145c438611175b41a0d.tar.gz rust-a6c92f0a179c4f048aaa5145c438611175b41a0d.zip | |
Revert "Revert "Merge pull request #2516 from mozilla/incoming" due to failures"
This reverts commit 9fae95860de510f6874810cf43efb83f101246ef.
Diffstat (limited to 'src/rustc/metadata')
| -rw-r--r-- | src/rustc/metadata/decoder.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rustc/metadata/decoder.rs b/src/rustc/metadata/decoder.rs index 644d519fc0f..4df45033a77 100644 --- a/src/rustc/metadata/decoder.rs +++ b/src/rustc/metadata/decoder.rs @@ -7,7 +7,6 @@ import syntax::{ast, ast_util}; import syntax::attr; import middle::ty; import syntax::ast_map; -import common::*; import tydecode::{parse_ty_data, parse_def_id, parse_bounds_data, parse_ident}; import syntax::print::pprust; @@ -15,6 +14,7 @@ import cmd=cstore::crate_metadata; import util::ppaux::ty_to_str; import ebml::deserializer; import syntax::diagnostic::span_handler; +import common::*; export class_dtor; export get_class_fields; |