diff options
| author | bors <bors@rust-lang.org> | 2016-12-17 06:43:16 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-12-17 06:43:16 +0000 |
| commit | f99d4dfef2cf3cbbf5699e44fddf019695e1d00d (patch) | |
| tree | 260767f07070b84f1c19a19eae4c0adc682f9afa /src/libsyntax/tokenstream.rs | |
| parent | d250169cb5a96481a3e7c8f9fe05de49f60e5ae5 (diff) | |
| parent | fd98a8d795b17b76ea6d1edcae55d4450efd466f (diff) | |
| download | rust-f99d4dfef2cf3cbbf5699e44fddf019695e1d00d.tar.gz rust-f99d4dfef2cf3cbbf5699e44fddf019695e1d00d.zip | |
Auto merge of #38205 - jseyfried:fix_module_directory_regression, r=eddyb
macros: fix the expected paths for a non-inline module matched by an `item` fragment Fixes #38190. r? @nrc
Diffstat (limited to 'src/libsyntax/tokenstream.rs')
| -rw-r--r-- | src/libsyntax/tokenstream.rs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/libsyntax/tokenstream.rs b/src/libsyntax/tokenstream.rs index 0d5dcaf339f..e352e7853c7 100644 --- a/src/libsyntax/tokenstream.rs +++ b/src/libsyntax/tokenstream.rs @@ -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. |
