Skip to content

Commit c122061

Browse files
authored
Rollup merge of #53093 - 0e4ef622:issue-52169-fix, r=petrochenkov
Enable macros to pass $:literal to another macro Fixes #52169.
2 parents 3385cae + 3d44da6 commit c122061

File tree

2 files changed

+28
-0
lines changed

2 files changed

+28
-0
lines changed

src/libsyntax/parse/token.rs

+4
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,10 @@ impl Token {
302302
BinOp(Minus) => true,
303303
Ident(ident, false) if ident.name == keywords::True.name() => true,
304304
Ident(ident, false) if ident.name == keywords::False.name() => true,
305+
Interpolated(ref nt) => match nt.0 {
306+
NtLiteral(..) => true,
307+
_ => false,
308+
},
305309
_ => false,
306310
}
307311
}

src/test/run-pass/issue-52169.rs

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
// Copyright 2018 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+
#![feature(macro_literal_matcher)]
12+
13+
macro_rules! a {
14+
($i:literal) => { "right" };
15+
($i:tt) => { "wrong" };
16+
}
17+
18+
macro_rules! b {
19+
($i:literal) => { a!($i) };
20+
}
21+
22+
fn main() {
23+
assert_eq!(b!(0), "right");
24+
}

0 commit comments

Comments
 (0)