diff options
| author | bors <bors@rust-lang.org> | 2019-08-04 16:19:04 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-08-04 16:19:04 +0000 |
| commit | f01b9f803b59f170f5dabaaa8aedc96abe45bfea (patch) | |
| tree | e7388497c7f95770a07c90e2a67edbc0aa9851f4 /src/libsyntax/ext/base.rs | |
| parent | 460072ebeed5a2463109894592ac172b47cdfb74 (diff) | |
| parent | c82e1f2d0e0b7fec9265eac851b2ac8b500ec4cc (diff) | |
| download | rust-f01b9f803b59f170f5dabaaa8aedc96abe45bfea.tar.gz rust-f01b9f803b59f170f5dabaaa8aedc96abe45bfea.zip | |
Auto merge of #62816 - estebank:type-ascription-macros, r=petrochenkov
Point at type ascription before macro invocation on expansion parse error Fix https://github.com/rust-lang/rust/issues/47666. Follow up to https://github.com/rust-lang/rust/pull/62791. r? @petrochenkov
Diffstat (limited to 'src/libsyntax/ext/base.rs')
| -rw-r--r-- | src/libsyntax/ext/base.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs index bb7834a133f..239fe55672e 100644 --- a/src/libsyntax/ext/base.rs +++ b/src/libsyntax/ext/base.rs @@ -713,6 +713,7 @@ pub struct ExpansionData { pub depth: usize, pub module: Rc<ModuleData>, pub directory_ownership: DirectoryOwnership, + pub prior_type_ascription: Option<(Span, bool)>, } /// One of these is made during expansion and incrementally updated as we go; @@ -743,6 +744,7 @@ impl<'a> ExtCtxt<'a> { depth: 0, module: Rc::new(ModuleData { mod_path: Vec::new(), directory: PathBuf::new() }), directory_ownership: DirectoryOwnership::Owned { relative: None }, + prior_type_ascription: None, }, expansions: FxHashMap::default(), allow_derive_markers: [sym::rustc_attrs, sym::structural_match][..].into(), |