Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-16 15:14:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #6929

Browse source 
6929: Handle $_ in mbe r=edwin0cheng a=lnicola

Fixes #6926

Co-authored-by: Laurențiu Nicola <lnicola@dend.ro>
This commit is contained in:
bors[bot] 2020-12-20 06:33:19 +00:00 committed by GitHub
commit 87886e8986
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/mbe/src/mbe_expander/transcriber.rs
View file

@ -97,7 +97,7 @@ fn expand_subtree(
err = err.or(e); err = err.or(e);
arena.push(tt.into()); arena.push(tt.into());
} }
Op::Var { name, kind: _ } => { Op::Var { name, .. } => {
let ExpandResult { value: fragment, err: e } = expand_var(ctx, name); let ExpandResult { value: fragment, err: e } = expand_var(ctx, name);
err = err.or(e); err = err.or(e);
push_fragment(arena, fragment); push_fragment(arena, fragment);

4
crates/mbe/src/parser.rs
View file

@ -101,7 +101,9 @@ fn next_op<'a>(
Op::Repeat { subtree, separator, kind } Op::Repeat { subtree, separator, kind }
} }
tt::TokenTree::Leaf(leaf) => match leaf { tt::TokenTree::Leaf(leaf) => match leaf {
tt::Leaf::Punct(..) => return Err(ExpandError::UnexpectedToken), tt::Leaf::Punct(_) => {
return Err(ExpandError::UnexpectedToken);
}
tt::Leaf::Ident(ident) => { tt::Leaf::Ident(ident) => {
let name = &ident.text; let name = &ident.text;
let kind = eat_fragment_kind(src, mode)?; let kind = eat_fragment_kind(src, mode)?;

3
crates/mbe/src/syntax_bridge.rs
View file

@ -313,7 +313,7 @@ trait TokenConvertor {
return; return;
} }
result.push(if k.is_punct() { result.push(if k.is_punct() && k != UNDERSCORE {
assert_eq!(range.len(), TextSize::of('.')); assert_eq!(range.len(), TextSize::of('.'));
let delim = match k { let delim = match k {
T!['('] => Some((tt::DelimiterKind::Parenthesis, T![')'])), T!['('] => Some((tt::DelimiterKind::Parenthesis, T![')'])),
@ -378,6 +378,7 @@ trait TokenConvertor {
let leaf: tt::Leaf = match k { let leaf: tt::Leaf = match k {
T![true] | T![false] => make_leaf!(Ident), T![true] | T![false] => make_leaf!(Ident),
IDENT => make_leaf!(Ident), IDENT => make_leaf!(Ident),
UNDERSCORE => make_leaf!(Ident),
k if k.is_keyword() => make_leaf!(Ident), k if k.is_keyword() => make_leaf!(Ident),
k if k.is_literal() => make_leaf!(Literal), k if k.is_literal() => make_leaf!(Literal),
LIFETIME_IDENT => { LIFETIME_IDENT => {

12
crates/mbe/src/tests.rs
View file

@ -991,6 +991,18 @@ fn test_tt_composite2() {
); );
} }
#[test]
fn test_underscore() {
parse_macro(
r#"
macro_rules! foo {
($_:tt) => { 0 }
}
"#,
)
.assert_expand_items(r#"foo! { => }"#, r#"0"#);
}
#[test] #[test]
fn test_lifetime() { fn test_lifetime() {
parse_macro( parse_macro(