about summary refs log tree commit diff
path: root/src/librustdoc/passes
diff options
context:
space:
mode:
authorVadim Petrochenkov <vadim.petrochenkov@gmail.com>2018-09-13 01:41:07 +0300
committerVadim Petrochenkov <vadim.petrochenkov@gmail.com>2018-09-13 05:10:45 +0300
commit1b6be5a1ca6a699bfaa26947f905efbb665039a5 (patch)
treefbf76689650fc919fb271d08b88e5d8d06658e3a /src/librustdoc/passes
parentf2302daef3608c09e2b50193a64611b18ced86f3 (diff)
downloadrust-1b6be5a1ca6a699bfaa26947f905efbb665039a5.tar.gz
rust-1b6be5a1ca6a699bfaa26947f905efbb665039a5.zip
resolve: Put different parent scopes into a single structure
Diffstat (limited to 'src/librustdoc/passes')
-rw-r--r--src/librustdoc/passes/collect_intra_doc_links.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/librustdoc/passes/collect_intra_doc_links.rs b/src/librustdoc/passes/collect_intra_doc_links.rs
index cced30d1a0c..181fe379248 100644
--- a/src/librustdoc/passes/collect_intra_doc_links.rs
+++ b/src/librustdoc/passes/collect_intra_doc_links.rs
@@ -398,12 +398,12 @@ impl<'a, 'tcx, 'rcx, 'cstore> DocFolder for LinkCollector<'a, 'tcx, 'rcx, 'cstor
 /// Resolve a string as a macro
 fn macro_resolve(cx: &DocContext, path_str: &str) -> Option<Def> {
     use syntax::ext::base::{MacroKind, SyntaxExtension};
-    use syntax::ext::hygiene::Mark;
     let segment = ast::PathSegment::from_ident(Ident::from_str(path_str));
     let path = ast::Path { segments: vec![segment], span: DUMMY_SP };
     let mut resolver = cx.resolver.borrow_mut();
-    let mark = Mark::root();
-    if let Ok(def) = resolver.resolve_macro_to_def_inner(&path, MacroKind::Bang, mark, &[], false) {
+    let parent_scope = resolver.dummy_parent_scope();
+    if let Ok(def) = resolver.resolve_macro_to_def_inner(&path, MacroKind::Bang,
+                                                         &parent_scope, false) {
         if let SyntaxExtension::DeclMacro { .. } = *resolver.get_macro(def) {
             return Some(def);
         }