bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

macros: fix the expected paths for a non-inline module matched by an item fragment.

Browse source
This commit is contained in:
Jeffrey Seyfried 2016-12-07 00:28:51 +00:00
parent daf8c1dfce
commit fd98a8d795
8 changed files with 63 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libsyntax/tokenstream.rs
View file

@ -31,7 +31,7 @@ use ext::base;
use ext::tt::macro_parser;
use parse::lexer::comments::{doc_comment_style, strip_doc_comment_decoration};
use parse::lexer;
use parse;
use parse::{self, Directory};
use parse::token::{self, Token, Lit, Nonterminal};
use print::pprust;
use symbol::Symbol;
@ -218,7 +218,11 @@ impl TokenTree {
let diag = &cx.parse_sess().span_diagnostic;
// `None` is because we're not interpolating
let arg_rdr = lexer::new_tt_reader(diag, None, tts.iter().cloned().collect());
macro_parser::parse(cx.parse_sess(), arg_rdr, mtch)
let directory = Directory {
path: cx.current_expansion.module.directory.clone(),
ownership: cx.current_expansion.directory_ownership,
};
macro_parser::parse(cx.parse_sess(), arg_rdr, mtch, Some(directory))
}
/// Check if this TokenTree is equal to the other, regardless of span information.