From dce0be03d94360d100825c134892e78c39858ef8 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Sun, 2 Nov 2014 23:10:09 -0800 Subject: Test fixes and rebase conflicts --- src/libsyntax/ext/base.rs | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/libsyntax/ext') diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs index bd6df9cb497..152b89b86e7 100644 --- a/src/libsyntax/ext/base.rs +++ b/src/libsyntax/ext/base.rs @@ -681,6 +681,10 @@ pub fn get_single_str_from_tts(cx: &mut ExtCtxt, name: &str) -> Option { let mut p = cx.new_parser_from_tts(tts); + if p.token == token::Eof { + cx.span_err(sp, format!("{} takes 1 argument", name).as_slice()); + return None + } let ret = cx.expander().fold_expr(p.parse_expr()); if p.token != token::Eof { cx.span_err(sp, format!("{} takes 1 argument", name).as_slice()); -- cgit 1.4.1-3-g733a5