about summary refs log tree commit diff
path: root/src/libsyntax_ext/source_util.rs
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2019-12-07 03:07:35 +0100
committerMazdak Farrokhzad <twingoow@gmail.com>2019-12-23 13:55:04 +0100
commit8456c403e1e79220d898b29074ce41dfeb752b08 (patch)
tree20f95a28e7691e6d3c99ee4b3b1ba22468ac3b40 /src/libsyntax_ext/source_util.rs
parentefdea63c432fb1c88000bd1e12566641705fdb13 (diff)
downloadrust-8456c403e1e79220d898b29074ce41dfeb752b08.tar.gz
rust-8456c403e1e79220d898b29074ce41dfeb752b08.zip
extract parse_not_expr
Diffstat (limited to 'src/libsyntax_ext/source_util.rs')
-rw-r--r--src/libsyntax_ext/source_util.rs20
1 files changed, 11 insertions, 9 deletions
diff --git a/src/libsyntax_ext/source_util.rs b/src/libsyntax_ext/source_util.rs
index 4f46252f8be..fccc36e2ea8 100644
--- a/src/libsyntax_ext/source_util.rs
+++ b/src/libsyntax_ext/source_util.rs
@@ -133,15 +133,17 @@ pub fn expand_include<'cx>(
             while self.p.token != token::Eof {
                 match panictry!(self.p.parse_item()) {
                     Some(item) => ret.push(item),
-                    None => self
-                        .p
-                        .sess
-                        .span_diagnostic
-                        .span_fatal(
-                            self.p.token.span,
-                            &format!("expected item, found `{}`", self.p.this_token_to_string()),
-                        )
-                        .raise(),
+                    None => {
+                        let token = pprust::token_to_string(&self.p.token);
+                        self.p
+                            .sess
+                            .span_diagnostic
+                            .span_fatal(
+                                self.p.token.span,
+                                &format!("expected item, found `{}`", token),
+                            )
+                            .raise();
+                    }
                 }
             }
             Some(ret)