Skip to content

Commit 909808f

Browse files
committed
Removed some cruft added for macro expansion serialization.
1 parent 3927f51 commit 909808f

File tree

3 files changed

+0
-11
lines changed

3 files changed

+0
-11
lines changed

src/librustc/middle/cstore.rs

-3
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,6 @@ pub struct ExternBodyNestedBodies {
253253
pub trait CrateStore {
254254
fn crate_data_as_rc_any(&self, krate: CrateNum) -> Rc<Any>;
255255

256-
fn ensure_hygiene_data_loaded(&self);
257-
258256
// access to the metadata loader
259257
fn metadata_loader(&self) -> &MetadataLoader;
260258

@@ -327,7 +325,6 @@ pub struct DummyCrateStore;
327325
impl CrateStore for DummyCrateStore {
328326
fn crate_data_as_rc_any(&self, krate: CrateNum) -> Rc<Any>
329327
{ bug!("crate_data_as_rc_any") }
330-
fn ensure_hygiene_data_loaded(&self) { bug!("ensure_hygiene_data_loaded") }
331328
// item info
332329
fn visibility_untracked(&self, def: DefId) -> ty::Visibility { bug!("visibility") }
333330
fn item_generics_cloned_untracked(&self, def: DefId) -> ty::Generics

src/librustc_metadata/cstore_impl.rs

-6
Original file line numberDiff line numberDiff line change
@@ -350,12 +350,6 @@ impl CrateStore for cstore::CStore {
350350
self.get_crate_data(krate)
351351
}
352352

353-
fn ensure_hygiene_data_loaded(&self) {
354-
self.iter_crate_data(|_, metadata| {
355-
(*metadata).imported_hygiene_data();
356-
});
357-
}
358-
359353
fn metadata_loader(&self) -> &MetadataLoader {
360354
&*self.metadata_loader
361355
}

src/librustc_metadata/encoder.rs

-2
Original file line numberDiff line numberDiff line change
@@ -351,8 +351,6 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
351351
}
352352

353353
fn encode_hygiene_data(&mut self) -> Lazy<hygiene::HygieneDataMap> {
354-
// FIXME(twk): remove the `ensure_hygiene_data_loaded` method
355-
// self.tcx.sess.cstore.ensure_hygiene_data_loaded();
356354
let data = hygiene::HygieneData::safe_with(|data| data.to_map());
357355
self.lazy(&data)
358356
}

0 commit comments

Comments
 (0)