From d1e3d6272e5128e15ba0ea3bd7c4588b5e8c444a Mon Sep 17 00:00:00 2001 From: Jeffrey Seyfried Date: Tue, 28 Jun 2016 01:45:54 +0000 Subject: Add the `after_expand` entry point between import resolution and the rest of name resolution --- src/librustdoc/core.rs | 6 +++--- src/librustdoc/test.rs | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/librustdoc') diff --git a/src/librustdoc/core.rs b/src/librustdoc/core.rs index f4da8167ea2..85ea94e02e8 100644 --- a/src/librustdoc/core.rs +++ b/src/librustdoc/core.rs @@ -149,9 +149,9 @@ pub fn run_core(search_paths: SearchPaths, let name = link::find_crate_name(Some(&sess), &krate.attrs, &input); let driver::ExpansionResult { defs, analysis, resolutions, mut hir_forest, .. } = { - let make_glob_map = resolve::MakeGlobMap::No; - driver::phase_2_configure_and_expand(&sess, &cstore, krate, &name, None, make_glob_map) - .expect("phase_2_configure_and_expand aborted in rustdoc!") + driver::phase_2_configure_and_expand( + &sess, &cstore, krate, &name, None, resolve::MakeGlobMap::No, |_| Ok(()), + ).expect("phase_2_configure_and_expand aborted in rustdoc!") }; let arenas = ty::CtxtArenas::new(); diff --git a/src/librustdoc/test.rs b/src/librustdoc/test.rs index 95d02d6ce4b..e3bc8037d13 100644 --- a/src/librustdoc/test.rs +++ b/src/librustdoc/test.rs @@ -95,9 +95,9 @@ pub fn run(input: &str, cfg.extend(config::parse_cfgspecs(cfgs.clone())); let krate = panictry!(driver::phase_1_parse_input(&sess, cfg, &input)); let driver::ExpansionResult { defs, mut hir_forest, .. } = { - let make_glob_map = MakeGlobMap::No; - phase_2_configure_and_expand(&sess, &cstore, krate, "rustdoc-test", None, make_glob_map) - .expect("phase_2_configure_and_expand aborted in rustdoc!") + phase_2_configure_and_expand( + &sess, &cstore, krate, "rustdoc-test", None, MakeGlobMap::No, |_| Ok(()) + ).expect("phase_2_configure_and_expand aborted in rustdoc!") }; let dep_graph = DepGraph::new(false); -- cgit 1.4.1-3-g733a5