Skip to content

Commit e859498

Browse files
committed
Auto merge of #27841 - jonas-schievink:still-repeating-span, r=alexcrichton
Current behaviour demo: http://is.gd/l3FEgo (The span is printed at the start of the source code) This patch moves the span to the use of `$i` in the macro rhs (as the code comment already claims)
2 parents 1e1b7f3 + 59f8e32 commit e859498

File tree

2 files changed

+20
-1
lines changed

2 files changed

+20
-1
lines changed

src/libsyntax/ext/tt/transcribe.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ pub fn tt_next_token(r: &mut TtReader) -> TokenAndSpan {
305305
}
306306
MatchedSeq(..) => {
307307
panic!(r.sp_diag.span_fatal(
308-
r.cur_span, /* blame the macro writer */
308+
sp, /* blame the macro writer */
309309
&format!("variable '{}' is still repeating at this depth",
310310
ident)));
311311
}

src/test/parse-fail/macro-repeat.rs

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
macro_rules! mac {
12+
( $($v:tt)* ) => (
13+
$v //~ ERROR still repeating at this depth
14+
)
15+
}
16+
17+
fn main() {
18+
mac!(0);
19+
}

0 commit comments

Comments
 (0)