From 8f2ab66ab631a11113ac2fbb66384ce7c2fc34d5 Mon Sep 17 00:00:00 2001 From: Leo Testard Date: Sat, 7 Feb 2015 17:23:33 +0100 Subject: Fix handling of parse errors when using `include!()`. Makes the compilation abort when a parse error is encountered while trying to parse an item in an included file. The previous behaviour was to stop processing the file when a token that can't start an item was encountered, without producing any error. Fixes #21146. --- src/libsyntax/ext/source_util.rs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/libsyntax/ext') diff --git a/src/libsyntax/ext/source_util.rs b/src/libsyntax/ext/source_util.rs index be02ba5ddc2..7a3a3562bdf 100644 --- a/src/libsyntax/ext/source_util.rs +++ b/src/libsyntax/ext/source_util.rs @@ -111,10 +111,14 @@ pub fn expand_include<'cx>(cx: &'cx mut ExtCtxt, sp: Span, tts: &[ast::TokenTree fn make_items(mut self: Box>) -> Option>> { let mut ret = SmallVector::zero(); - loop { + while self.p.token != token::Eof { match self.p.parse_item_with_outer_attributes() { Some(item) => ret.push(item), - None => break + None => self.p.span_fatal( + self.p.span, + &format!("expected item, found `{}`", + self.p.this_token_to_string())[] + ) } } Some(ret) -- cgit 1.4.1-3-g733a5