diff --git a/src/libstd/ebml2.rs b/src/libstd/ebml2.rs deleted file mode 100644 index f5410233c92..00000000000 --- a/src/libstd/ebml2.rs +++ /dev/null @@ -1 +0,0 @@ -pub use ebml::*; diff --git a/src/libstd/prettyprint2.rs b/src/libstd/prettyprint2.rs deleted file mode 100644 index a3bf40ecf72..00000000000 --- a/src/libstd/prettyprint2.rs +++ /dev/null @@ -1 +0,0 @@ -pub use prettyprint::*; diff --git a/src/libstd/serialization2.rs b/src/libstd/serialization2.rs deleted file mode 100644 index 9ea54477869..00000000000 --- a/src/libstd/serialization2.rs +++ /dev/null @@ -1,7 +0,0 @@ -//! Support code for serialization. - -/* -Core serialization interfaces. -*/ - -pub use serialization::*; diff --git a/src/libstd/std.rc b/src/libstd/std.rc index 7fc3004bbcf..88ef03aa534 100644 --- a/src/libstd/std.rc +++ b/src/libstd/std.rc @@ -69,7 +69,6 @@ pub mod treemap; // And ... other stuff pub mod ebml; -pub mod ebml2; pub mod dbg; pub mod getopts; pub mod json; @@ -79,7 +78,6 @@ pub mod tempfile; pub mod term; pub mod time; pub mod prettyprint; -pub mod prettyprint2; pub mod arena; pub mod par; pub mod cmp; @@ -93,7 +91,6 @@ mod unicode; pub mod test; pub mod serialization; -pub mod serialization2; // Local Variables: // mode: rust; diff --git a/src/rustc/metadata/csearch.rs b/src/rustc/metadata/csearch.rs index 52813eb6b75..5f5f938541f 100644 --- a/src/rustc/metadata/csearch.rs +++ b/src/rustc/metadata/csearch.rs @@ -1,6 +1,6 @@ // Searching for information from the cstore -use std::ebml2; +use std::ebml; use syntax::ast; use syntax::ast_util; use syntax::ast_map; @@ -136,7 +136,7 @@ fn get_field_type(tcx: ty::ctxt, class_id: ast::def_id, def: ast::def_id) -> ty::ty_param_bounds_and_ty { let cstore = tcx.cstore; let cdata = cstore::get_crate_data(cstore, class_id.crate); - let all_items = ebml2::get_doc(ebml2::Doc(cdata.data), tag_items); + let all_items = ebml::get_doc(ebml::Doc(cdata.data), tag_items); debug!("Looking up %?", class_id); let class_doc = expect(tcx.diag, decoder::maybe_find_item(class_id.node, all_items),