Unnamed repository; edit this file 'description' to name the repository.
Merge pull request #19097 from Veykril/push-xmkmkwplqnlr
Bump proc-macro2 in xtask
| -rw-r--r-- | Cargo.lock | 4 | ||||
| -rw-r--r-- | xtask/Cargo.toml | 3 | ||||
| -rw-r--r-- | xtask/src/codegen/grammar.rs | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/Cargo.lock b/Cargo.lock index 3ba7df3ad5..bf408d1a52 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1408,9 +1408,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99" dependencies = [ "unicode-ident", ] diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml index b505ee835b..ebd8903ad8 100644 --- a/xtask/Cargo.toml +++ b/xtask/Cargo.toml @@ -16,8 +16,7 @@ xflags = "0.3.0" time = { version = "0.3", default-features = false } zip = { version = "0.6", default-features = false, features = ["deflate", "time"] } stdx.workspace = true -# https://github.com/dtolnay/proc-macro2/issues/475 -proc-macro2 = "=1.0.86" +proc-macro2 = "1.0.93" quote = "1.0.20" ungrammar = "1.16.1" either.workspace = true diff --git a/xtask/src/codegen/grammar.rs b/xtask/src/codegen/grammar.rs index d5fe323678..e20dda7fec 100644 --- a/xtask/src/codegen/grammar.rs +++ b/xtask/src/codegen/grammar.rs @@ -397,6 +397,9 @@ fn generate_syntax_kinds(grammar: KindsSrc) -> String { if "{}[]()".contains(token) { let c = token.chars().next().unwrap(); quote! { #c } + // underscore is an identifier in the proc-macro api + } else if *token == "_" { + quote! { _ } } else { let cs = token.chars().map(|c| Punct::new(c, Spacing::Joint)); quote! { #(#cs)* } |