summary refs log tree commit diff
path: root/src/libsyntax/ext
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2014-11-02 23:10:09 -0800
committerAlex Crichton <alex@alexcrichton.com>2014-11-03 11:02:36 -0800
commitdce0be03d94360d100825c134892e78c39858ef8 (patch)
treedca9b3f476907c8c6addc7ec1afb01c789c6d330 /src/libsyntax/ext
parent02300dc90d4199724f46f6246b57cb10a1288910 (diff)
downloadrust-dce0be03d94360d100825c134892e78c39858ef8.tar.gz
rust-dce0be03d94360d100825c134892e78c39858ef8.zip
Test fixes and rebase conflicts
Diffstat (limited to 'src/libsyntax/ext')
-rw-r--r--src/libsyntax/ext/base.rs4
1 files changed, 4 insertions, 0 deletions
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<String> {
     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());