about summary refs log tree commit diff
path: root/src/test/parse-fail
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-11-11 02:51:01 -0800
committerGitHub <noreply@github.com>2016-11-11 02:51:01 -0800
commit4da129d98419733bb408141ca53610bb77368cf0 (patch)
tree1355601d6d0ff942eef9ca2c4ee27e6913bca9a1 /src/test/parse-fail
parent280362a02df97670dd08ed19557c81b504b395c3 (diff)
parenteed86fac91c12707b8ef6693a5cf2106ca6652c0 (diff)
downloadrust-4da129d98419733bb408141ca53610bb77368cf0.tar.gz
rust-4da129d98419733bb408141ca53610bb77368cf0.zip
Auto merge of #37246 - goffrie:no-loop, r=jseyfried
Don't spin expanding stmt macros.

If we can't make progress when parsing a macro expansion as a statement then we should just bail.

This alleviates the symptoms shown in e.g. #37113 and #37234 but it doesn't fix the problem that parsing invalid enum bodies (and others) leaves the parser in a crappy state.

I'm not sold on this strategy (checking `tokens_consumed`), so if anyone has a better idea, I'm all ears!
Diffstat (limited to 'src/test/parse-fail')
-rw-r--r--src/test/parse-fail/issue-37234.rs19
1 files changed, 19 insertions, 0 deletions
diff --git a/src/test/parse-fail/issue-37234.rs b/src/test/parse-fail/issue-37234.rs
new file mode 100644
index 00000000000..651e11d9d21
--- /dev/null
+++ b/src/test/parse-fail/issue-37234.rs
@@ -0,0 +1,19 @@
+// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+macro_rules! failed {
+    () => {{
+        let x = 5 ""; //~ ERROR found `""`
+    }} //~ ERROR macro expansion ignores token `}`
+}
+
+fn main() {
+    failed!();
+}