From 59f8e3238a38afe350bf8cdc119d7315bf9b5f6c Mon Sep 17 00:00:00 2001
From: Jonas Schievink <jonas@schievink.net>
Date: Fri, 14 Aug 2015 23:26:19 +0200
Subject: [PATCH] Fix span of invalid metavariable repetition

---
 src/libsyntax/ext/tt/transcribe.rs  |  2 +-
 src/test/parse-fail/macro-repeat.rs | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 src/test/parse-fail/macro-repeat.rs

diff --git a/src/libsyntax/ext/tt/transcribe.rs b/src/libsyntax/ext/tt/transcribe.rs
index 0ca755c97b1..b07bd099638 100644
--- a/src/libsyntax/ext/tt/transcribe.rs
+++ b/src/libsyntax/ext/tt/transcribe.rs
@@ -305,7 +305,7 @@ pub fn tt_next_token(r: &mut TtReader) -> TokenAndSpan {
                             }
                             MatchedSeq(..) => {
                                 panic!(r.sp_diag.span_fatal(
-                                    r.cur_span, /* blame the macro writer */
+                                    sp, /* blame the macro writer */
                                     &format!("variable '{}' is still repeating at this depth",
                                             ident)));
                             }
diff --git a/src/test/parse-fail/macro-repeat.rs b/src/test/parse-fail/macro-repeat.rs
new file mode 100644
index 00000000000..3abadd885ac
--- /dev/null
+++ b/src/test/parse-fail/macro-repeat.rs
@@ -0,0 +1,19 @@
+// Copyright 2015 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! mac {
+    ( $($v:tt)* ) => (
+        $v  //~ ERROR still repeating at this depth
+    )
+}
+
+fn main() {
+    mac!(0);
+}