squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Rename the exp field to mirror its uses

Browse source
This commit is contained in:
Oliver Scherer 2019-02-04 11:16:50 +01:00
parent 33bf81eec0
commit 87d5383ec3
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/librustc_plugin/registry.rs
View file

@ -110,8 +110,8 @@ impl<'a> Registry<'a> {
edition,
}
}
IdentTT { ext, span: _, allow_internal_unstable } => {
IdentTT { ext, span: Some(self.krate_span), allow_internal_unstable }
IdentTT { expander, span: _, allow_internal_unstable } => {
IdentTT { expander, span: Some(self.krate_span), allow_internal_unstable }
}
_ => extension,
}));

2
src/libsyntax/ext/base.rs
View file

@ -658,7 +658,7 @@ pub enum SyntaxExtension {
/// A function-like syntax extension that has an extra ident before
/// the block.
IdentTT {
ext: Box<dyn IdentMacroExpander + sync::Sync + sync::Send>,
expander: Box<dyn IdentMacroExpander + sync::Sync + sync::Send>,
span: Option<Span>,
allow_internal_unstable: Vec<Symbol>,
},

2
src/libsyntax/ext/expand.rs
View file

@ -792,7 +792,7 @@ impl<'a, 'b> MacroExpander<'a, 'b> {
}
}
IdentTT { ext: ref expander, span: tt_span, ref allow_internal_unstable } => {
IdentTT { ref expander, span: tt_span, ref allow_internal_unstable } => {
if ident.name == keywords::Invalid.name() {
self.cx.span_err(path.span,
&format!("macro {}! expects an ident argument", path));