From 87d5383ec30e9837215b0d4a6e03b28bd9594117 Mon Sep 17 00:00:00 2001
From: Oliver Scherer <github35764891676564198441@oli-obk.de>
Date: Mon, 4 Feb 2019 11:16:50 +0100
Subject: [PATCH] Rename the `exp` field to mirror its uses

---
 src/librustc_plugin/registry.rs | 4 ++--
 src/libsyntax/ext/base.rs       | 2 +-
 src/libsyntax/ext/expand.rs     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/librustc_plugin/registry.rs b/src/librustc_plugin/registry.rs
index 14312f0b2f7..9ff10ff851a 100644
--- a/src/librustc_plugin/registry.rs
+++ b/src/librustc_plugin/registry.rs
@@ -110,8 +110,8 @@ pub fn register_syntax_extension(&mut self, name: ast::Name, extension: SyntaxEx
                     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,
         }));
diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs
index 02d6d721873..ec7d0e423b4 100644
--- a/src/libsyntax/ext/base.rs
+++ b/src/libsyntax/ext/base.rs
@@ -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>,
     },
diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs
index 65500cd23bd..2d4082386b2 100644
--- a/src/libsyntax/ext/expand.rs
+++ b/src/libsyntax/ext/expand.rs
@@ -792,7 +792,7 @@ fn expand_bang_invoc(&mut self,
                 }
             }
 
-            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));
-- 
2.44.0