Skip to content

Commit

Permalink
Merge pull request #39141 from jseyfried/unbreak_beta
Browse files Browse the repository at this point in the history
Unbreak beta
  • Loading branch information
brson committed Jan 17, 2017
2 parents 11bab50 + 2a556d2 commit fd490b8
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/librustc_resolve/build_reduced_graph.rs
Original file line number Diff line number Diff line change
Expand Up @@ -494,12 +494,13 @@ impl<'b> Resolver<'b> {

fn get_extern_crate_root(&mut self, cnum: CrateNum) -> Module<'b> {
let def_id = DefId { krate: cnum, index: CRATE_DEF_INDEX };
let name = self.session.cstore.crate_name(cnum);
let macros_only = self.session.cstore.dep_kind(cnum).macros_only();
let arenas = self.arenas;
*self.extern_crate_roots.entry((cnum, macros_only)).or_insert_with(|| {
arenas.alloc_module(ModuleS {
populated: Cell::new(false),
..ModuleS::new(None, ModuleKind::Def(Def::Mod(def_id), keywords::Invalid.name()))
..ModuleS::new(None, ModuleKind::Def(Def::Mod(def_id), name))
})
})
}
Expand Down

0 comments on commit fd490b8

Please sign in to comment.