Rollup merge of #130489 - compiler-errors:raw-lt-lint, r=jieyouxu

Ensure that `keyword_ident` lint doesn't trigger on `'r#kw` lifetime Fixes #130486
rust-lang · Sep 18, 2024 · 32c4d41 · 32c4d41
2 parents 09b255d + 5de89bb
commit 32c4d41
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/compiler/rustc_parse/src/lexer/mod.rs b/compiler/rustc_parse/src/lexer/mod.rs
@@ -299,6 +299,9 @@ impl<'psess, 'src> StringReader<'psess, 'src> {
                         lifetime_name += lifetime_name_without_tick;
                         let sym = Symbol::intern(&lifetime_name);
 
+                        // Make sure we mark this as a raw identifier.
+                        self.psess.raw_identifier_spans.push(self.mk_sp(start, self.pos));
+
                         token::Lifetime(sym, IdentIsRaw::Yes)
                     } else {
                         // Otherwise, this should be parsed like `'r`. Warn about it though.

diff --git a/tests/ui/rust-2024/raw-gen-lt.rs b/tests/ui/rust-2024/raw-gen-lt.rs
@@ -0,0 +1,8 @@
+//@ edition: 2021
+//@ check-pass
+
+#![deny(keyword_idents_2024)]
+
+fn foo<'r#gen>() {}
+
+fn main() {}