diff options
| -rw-r--r-- | src/librustc/hir/map/def_collector.rs | 4 | ||||
| -rw-r--r-- | src/librustc_driver/driver.rs | 2 | ||||
| -rw-r--r-- | src/test/run-make/execution-engine/test.rs | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/librustc/hir/map/def_collector.rs b/src/librustc/hir/map/def_collector.rs index b2456f4ab87..053d32305be 100644 --- a/src/librustc/hir/map/def_collector.rs +++ b/src/librustc/hir/map/def_collector.rs @@ -109,9 +109,9 @@ impl<'ast> visit::Visitor<'ast> for DefCollector<'ast> { ItemKind::DefaultImpl(..) | ItemKind::Impl(..) => DefPathData::Impl, ItemKind::Enum(..) | ItemKind::Struct(..) | ItemKind::Trait(..) | - ItemKind::ExternCrate(..) | ItemKind::Mod(..) | ItemKind::ForeignMod(..) | - ItemKind::Ty(..) => + ItemKind::ExternCrate(..) | ItemKind::ForeignMod(..) | ItemKind::Ty(..) => DefPathData::TypeNs(i.ident.name), + ItemKind::Mod(..) => DefPathData::Module(i.ident.name), ItemKind::Static(..) | ItemKind::Const(..) | ItemKind::Fn(..) => DefPathData::ValueNs(i.ident.name), ItemKind::Mac(..) => DefPathData::MacroDef(i.ident.name), diff --git a/src/librustc_driver/driver.rs b/src/librustc_driver/driver.rs index 26422e3194a..5fc2a955c06 100644 --- a/src/librustc_driver/driver.rs +++ b/src/librustc_driver/driver.rs @@ -121,7 +121,7 @@ pub fn compile_input(sess: &Session, Ok(())); let expanded_crate = assign_node_ids(sess, expanded_crate); - let dep_graph = DepGraph::new(sess.opts.build_dep_graph); + let dep_graph = DepGraph::new(sess.opts.build_dep_graph()); // Collect defintions for def ids. let defs = &RefCell::new(time(sess.time_passes(), diff --git a/src/test/run-make/execution-engine/test.rs b/src/test/run-make/execution-engine/test.rs index 86b9c4c81c6..b9a45c09626 100644 --- a/src/test/run-make/execution-engine/test.rs +++ b/src/test/run-make/execution-engine/test.rs @@ -239,7 +239,7 @@ fn compile_program(input: &str, sysroot: PathBuf) let krate = driver::phase_2_configure_and_expand(&sess, &cstore, krate, &id, None) .expect("phase_2 returned `None`"); - let dep_graph = DepGraph::new(sess.opts.build_dep_graph); + let dep_graph = DepGraph::new(sess.opts.build_dep_graph()); let krate = driver::assign_node_ids(&sess, krate); let defs = RefCell::new(ast_map::collect_definitions(&krate)); LocalCrateReader::new(&sess, &cstore, &defs, &krate, &id).read_crates(&dep_graph); |