about summary refs log tree commit diff
path: root/src/libsyntax/ext/trace_macros.rs
diff options
context:
space:
mode:
authorDouglas Young <rcxdude@gmail.com>2014-02-18 16:14:12 +0000
committerDouglas Young <rcxdude@gmail.com>2014-02-18 16:17:51 +0000
commit0bdfd0f4c76fa29a4be774937bc72165390b06d6 (patch)
treee595de26e0a25bd8b8258a82ef653553c499d42e /src/libsyntax/ext/trace_macros.rs
parent517e38997db9f60612676c9f83dab6ed35c1b5df (diff)
downloadrust-0bdfd0f4c76fa29a4be774937bc72165390b06d6.tar.gz
rust-0bdfd0f4c76fa29a4be774937bc72165390b06d6.zip
Avoid returning original macro if expansion fails.
Closes #11692. Instead of returning the original expression, a dummy expression
(with identical span) is returned. This prevents infinite loops of failed
expansions as well as odd double error messages in certain situations.
Diffstat (limited to 'src/libsyntax/ext/trace_macros.rs')
-rw-r--r--src/libsyntax/ext/trace_macros.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/ext/trace_macros.rs b/src/libsyntax/ext/trace_macros.rs
index 4189ea6a967..db2c9dcddb6 100644
--- a/src/libsyntax/ext/trace_macros.rs
+++ b/src/libsyntax/ext/trace_macros.rs
@@ -33,7 +33,7 @@ pub fn expand_trace_macros(cx: &mut ExtCtxt,
         cx.set_trace_macros(false);
     } else {
         cx.span_err(sp, "trace_macros! only accepts `true` or `false`");
-        return base::MacResult::dummy_expr();
+        return base::MacResult::dummy_expr(sp);
     }
 
     rust_parser.bump();