Skip to content

Commit ef902a2

Browse files
committed
when encoding, push MetaData(foo) task on stack
This lets us determine what was used to construct the metadata. Conflicts: src/librustc_metadata/encoder.rs
1 parent 5bcdf4c commit ef902a2

File tree

4 files changed

+71
-54
lines changed

4 files changed

+71
-54
lines changed

src/librustc/dep_graph/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@ pub use self::dep_node::DepNode;
2222
pub use self::graph::DepGraph;
2323
pub use self::query::DepGraphQuery;
2424
pub use self::visit::visit_all_items_in_krate;
25+
pub use self::raii::DepTask;

src/librustc_metadata/csearch.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ impl<'tcx> CrateStore<'tcx> for cstore::CStore {
6464
decoder::closure_kind(&cdata, def_id.index)
6565
}
6666

67-
fn closure_ty(&self, tcx: &TyCtxt<'tcx>, def_id: DefId) -> ty::ClosureTy<'tcx> {
67+
fn closure_ty<'a>(&self, tcx: TyCtxt<'a, 'tcx, 'tcx>, def_id: DefId) -> ty::ClosureTy<'tcx> {
6868
assert!(!def_id.is_local());
6969
self.dep_graph.read(DepNode::MetaData(def_id));
7070
let cdata = self.get_crate_data(def_id.krate);

0 commit comments

Comments
 (0)