Skip to content

Commit bc8e0a7

Browse files
lilyballalexcrichton
authored andcommitted
---
yaml --- r: 153060 b: refs/heads/try2 c: b81905e h: refs/heads/master v: v3
1 parent 73ff6aa commit bc8e0a7

File tree

3 files changed

+37
-3
lines changed

3 files changed

+37
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 9868b65b153a5bed9ca75eca750efae13e93cc44
8+
refs/heads/try2: b81905eedbf56e026e8144a32056fd5dd0265d3b
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libsyntax/parse/parser.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3248,7 +3248,7 @@ impl<'a> Parser<'a> {
32483248
None => {
32493249
// we only expect an ident if we didn't parse one
32503250
// above.
3251-
let ident_str = if id == token::special_idents::invalid {
3251+
let ident_str = if id.name == token::special_idents::invalid.name {
32523252
"identifier, "
32533253
} else {
32543254
""
@@ -3268,7 +3268,7 @@ impl<'a> Parser<'a> {
32683268
);
32693269
let hi = self.span.hi;
32703270

3271-
if id == token::special_idents::invalid {
3271+
if id.name == token::special_idents::invalid.name {
32723272
return box(GC) spanned(lo, hi, StmtMac(
32733273
spanned(lo, hi, MacInvocTT(pth, tts, EMPTY_CTXT)), false));
32743274
} else {
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
// Copyright 2014 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+
// We only want to assert that this doesn't ICE, we don't particularly care
12+
// about whether it nor it fails to compile.
13+
14+
// error-pattern:
15+
16+
#![feature(macro_rules)]
17+
18+
macro_rules! foo{
19+
() => {{
20+
macro_rules! bar{() => (())}
21+
1
22+
}}
23+
}
24+
25+
pub fn main() {
26+
foo!();
27+
28+
assert!({one! two()});
29+
30+
// regardless of whether nested macro_rules works, the following should at
31+
// least throw a conventional error.
32+
assert!({one! two});
33+
}
34+

0 commit comments

Comments
 (0)