Move `ensure_complete_parse` into `expand.rs`.

2 files changed, 12 insertions, 14 deletions

diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs
index 62339695807..7c43f1f3076 100644
--- a/src/libsyntax/ext/expand.rs
+++ b/src/libsyntax/ext/expand.rs
@@ -500,6 +500,18 @@ impl<'a> Parser<'a> {
             ExpansionKind::Pat => Expansion::Pat(self.parse_pat()?),
         })
     }
+
+    pub fn ensure_complete_parse(&mut self, macro_name: ast::Name, kind_name: &str, span: Span) {
+        if self.token != token::Eof {
+            let msg = format!("macro expansion ignores token `{}` and any following",
+                              self.this_token_to_string());
+            let mut err = self.diagnostic().struct_span_err(self.span, &msg);
+            let msg = format!("caused by the macro expansion here; the usage \
+                               of `{}!` is likely invalid in {} context",
+                               macro_name, kind_name);
+            err.span_note(span, &msg).emit();
+        }
+    }
 }
 
 struct InvocationCollector<'a, 'b: 'a> {
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 410ecf068b9..e83d003ab74 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -6171,18 +6171,4 @@ impl<'a> Parser<'a> {
             _ =>  Err(self.fatal("expected string literal"))
         }
     }
-
-    pub fn ensure_complete_parse(&mut self, macro_name: ast::Name, kind_name: &str, span: Span) {
-        if self.token == token::Eof {
-            return
-        }
-
-        let msg = format!("macro expansion ignores token `{}` and any following",
-                          self.this_token_to_string());
-        let mut err = self.diagnostic().struct_span_err(self.span, &msg);
-        let msg = format!("caused by the macro expansion here; the usage \
-                           of `{}!` is likely invalid in {} context",
-                           macro_name, kind_name);
-        err.span_note(span, &msg).emit();
-    }
 }