diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-03-21 00:10:14 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2021-03-21 00:10:14 +0000 |
commit | 787bd3c5516d250245f6070308d689311b638fbe (patch) | |
tree | 3513cb44470b7ff148258bc300402be778c7f097 /crates/mbe/src/parser.rs | |
parent | 090e013161ab5b1679554ddd53683e81e3fe845a (diff) | |
parent | 0a7f28620a7002f47890c2030862052bcbf25cdb (diff) |
Merge #8122
8122: Make bare underscore token an Ident rather than Punct in proc-macro r=edwin0cheng a=kevinmehall
In rustc and proc-macro2, a bare `_` token is parsed for procedural macro purposes as `Ident` rather than `Punct` (see https://github.com/rust-lang/rust/pull/48842). This changes rust-analyzer to match rustc's behavior and implementation by handling `_` as an Ident in token trees, but explicitly preventing `$x:ident` from matching it in MBE.
proc macro crate:
```rust
#[proc_macro]
pub fn input(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
dbg!(input)
}
```
test crate:
```rust
test_proc_macro::input!(_);
```
output (rustc):
```rust
[test-proc-macro/src/lib.rs:10] input = TokenStream [
Ident {
ident: "_",
span: #0 bytes(173..174),
},
]
```
output (rust-analyzer before this change):
```rust
[test-proc-macro/src/lib.rs:10] input = TokenStream [
Punct {
ch: '_',
spacing: Joint,
span: 4294967295,
},
]
```
output (rust-analyzer after this change):
```rust
[test-proc-macro/src/lib.rs:10] input = TokenStream [
Ident {
ident: "_",
span: 4294967295,
},
]
```
Co-authored-by: Kevin Mehall <[email protected]>
Diffstat (limited to 'crates/mbe/src/parser.rs')
-rw-r--r-- | crates/mbe/src/parser.rs | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/crates/mbe/src/parser.rs b/crates/mbe/src/parser.rs index 7b5b8ec16..c88387653 100644 --- a/crates/mbe/src/parser.rs +++ b/crates/mbe/src/parser.rs | |||
@@ -177,16 +177,8 @@ fn next_op<'a>(first: &tt::TokenTree, src: &mut TtIter<'a>, mode: Mode) -> Resul | |||
177 | Op::Repeat { tokens: MetaTemplate(tokens), separator, kind } | 177 | Op::Repeat { tokens: MetaTemplate(tokens), separator, kind } |
178 | } | 178 | } |
179 | tt::TokenTree::Leaf(leaf) => match leaf { | 179 | tt::TokenTree::Leaf(leaf) => match leaf { |
180 | tt::Leaf::Punct(punct) => { | 180 | tt::Leaf::Punct(_) => { |
181 | static UNDERSCORE: SmolStr = SmolStr::new_inline("_"); | 181 | return Err(ParseError::Expected("ident".to_string())); |
182 | |||
183 | if punct.char != '_' { | ||
184 | return Err(ParseError::Expected("_".to_string())); | ||
185 | } | ||
186 | let name = UNDERSCORE.clone(); | ||
187 | let kind = eat_fragment_kind(src, mode)?; | ||
188 | let id = punct.id; | ||
189 | Op::Var { name, kind, id } | ||
190 | } | 182 | } |
191 | tt::Leaf::Ident(ident) if ident.text == "crate" => { | 183 | tt::Leaf::Ident(ident) if ident.text == "crate" => { |
192 | // We simply produce identifier `$crate` here. And it will be resolved when lowering ast to Path. | 184 | // We simply produce identifier `$crate` here. And it will be resolved when lowering ast to Path. |