print raw lifetime idents with r# #144897

fee1-dead · 2025-08-04T09:45:45Z

This replaces #143185 and fixes #143150

rustbot · 2025-08-04T09:45:54Z

This PR modifies tests/ui/issues/. If this PR is adding new tests to tests/ui/issues/,
please refrain from doing so, and instead add it to more descriptive subdirectories.

WaffleLapkin · 2025-08-04T09:56:56Z

compiler/rustc_span/src/symbol.rs

+        if let Some(ident) = self.as_raw_lifetime_name_without_apostrophe() {
+            write!(f, "'{}", IdentPrinter::new(ident.name, true, None))
+        } else {
+            fmt::Display::fmt(&IdentPrinter::new(self.name, self.is_raw_guess(), None), f)
+        }


Why is this not a change in IdentPrinter instead?

How do you propose us to make the check in IdentPrinter? It doesn't know about editions because it only accepts the symbol. is_raw_guess and as_raw_lifetime_name_without_apostrophe both need the span edition to know whether some identifier is treated as a keyword or not.

I suppose it could accept edition as a parameter? otherwise I'm not sure what's even the point of it

otherwise I'm not sure what's even the point of it

Just looked at the code again. IdentPrinter is used from two general places. One where one has the token data (sorta at the parsing/ast/proc macro stage) in which rawness of idents are known and do not need to be guessed, and one at a later stage where they do. that's why rawness was originally passed as a bool. To improve the design as you highlighted I chose to change the original bool into an enum, but we still have to guess whether a raw lifetime should be printed here and not inside IdentPrinter.

tests/ui/lifetimes/raw/use-of-undeclared-raw-lifetimes.stderr

fmease

Thanks! r=me with nits addressed in one way or another

View changes since this review

fmease · 2025-08-21T13:18:35Z

compiler/rustc_parse/src/parser/expr.rs

@@ -3090,7 +3090,13 @@ impl<'a> Parser<'a> {
        if let Some((ident, is_raw)) = self.token.lifetime() {
            // Disallow `'fn`, but with a better error message than `expect_lifetime`.
            if matches!(is_raw, IdentIsRaw::No) && ident.without_first_quote().is_reserved() {
-                self.dcx().emit_err(errors::InvalidLabel { span: ident.span, name: ident.name });
+                self.dcx().emit_err(errors::InvalidLabel {


alternatively, we could just mimic the diagnostic emitted by expect_lifetime ("lifetimes cannot use keyword names") and just say "labels cannot use keyword names"

compiler/rustc_span/src/symbol.rs

fmease · 2025-08-21T13:44:30Z

compiler/rustc_span/src/symbol.rs

+        // this should be kept consistent with `Parser::expect_lifetime` found under
+        // compiler/rustc_parse/src/parser/ty.rs
+        let name_without_apostrophe = self.without_first_quote();
+        name_without_apostrophe.name != self.name
+            && ![kw::UnderscoreLifetime, kw::StaticLifetime].contains(&self.name)
+            && name_without_apostrophe.is_raw_guess()


Since rustc_span actually defines Ident and is_reserved, you could reasonably also define a canonical "is_reserved_lifetime" which you can then reuse.

rustbot · 2025-08-22T05:07:17Z

This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

fee1-dead · 2025-08-22T07:39:43Z

@bors r=fmease

bors · 2025-08-22T07:39:46Z

📌 Commit 4970127 has been approved by fmease

It is now in the queue for this repository.

…inting, r=fmease print raw lifetime idents with r# This replaces rust-lang#143185 and fixes rust-lang#143150 cc `@fmease`

Rollup of 20 pull requests Successful merges: - #132087 (Fix overly restrictive lifetime in `core::panic::Location::file` return type) - #137396 (Recover `param: Ty = EXPR`) - #142185 (Convert moves of references to copies in ReferencePropagation) - #144443 (Make target pointer width in target json an integer) - #144648 (Implementation: `#[feature(nonpoison_rwlock)]`) - #144897 (print raw lifetime idents with r#) - #145218 ([Debuginfo] improve enum value formatting in LLDB for better readability) - #145380 (Add codegen-llvm regression tests) - #145573 (Add an experimental unsafe(force_target_feature) attribute.) - #145597 (resolve: Remove `ScopeSet::Late`) - #145641 (On E0277, point at type that doesn't implement bound) - #145669 (rustdoc-search: GUI tests check for `//` in URL) - #145695 (Introduce ProjectionElem::try_map.) - #145710 (Fix the ABI parameter inconsistency issue in debug.rs for LoongArch64) - #145726 (Experiment: Reborrow trait) - #145731 (Make raw pointers work in type-based search) - #145736 (triagebot: Update style team reviewers) - #145738 (Uplift rustc_mir_transform::coverage::counters::union_find to rustc_data_structures.) - #145743 (doc: fix some typos in comment) - #145745 (tests: Ignore basic-stepping.rs on LoongArch) Failed merges: - #145670 (port `sanitize` attribute to the new parsing infrastructure) r? `@ghost` `@rustbot` modify labels: rollup

Rollup of 28 pull requests Successful merges: - #132087 (Fix overly restrictive lifetime in `core::panic::Location::file` return type) - #137396 (Recover `param: Ty = EXPR`) - #137457 (Fix host code appearing in Wasm binaries) - #142185 (Convert moves of references to copies in ReferencePropagation) - #144648 (Implementation: `#[feature(nonpoison_rwlock)]`) - #144897 (print raw lifetime idents with r#) - #145218 ([Debuginfo] improve enum value formatting in LLDB for better readability) - #145380 (Add codegen-llvm regression tests) - #145573 (Add an experimental unsafe(force_target_feature) attribute.) - #145597 (resolve: Remove `ScopeSet::Late`) - #145633 (Fix some typos in LocalKey documentation) - #145641 (On E0277, point at type that doesn't implement bound) - #145669 (rustdoc-search: GUI tests check for `//` in URL) - #145695 (Introduce ProjectionElem::try_map.) - #145710 (Fix the ABI parameter inconsistency issue in debug.rs for LoongArch64) - #145726 (Experiment: Reborrow trait) - #145731 (Make raw pointers work in type-based search) - #145736 (triagebot: Update style team reviewers) - #145738 (Uplift rustc_mir_transform::coverage::counters::union_find to rustc_data_structures.) - #145742 (rustdoc js: Even more typechecking improvments ) - #145743 (doc: fix some typos in comment) - #145745 (tests: Ignore basic-stepping.rs on LoongArch) - #145747 (Refactor lint buffering to avoid requiring a giant enum) - #145751 (fix(lexer): Allow '-' in the frontmatter infostring continue set) - #145761 (Add aarch64_be-unknown-hermit target) - #145762 (convert strings to symbols in attr diagnostics) - #145763 (Ship LLVM tools for the correct target when cross-compiling) - #145765 (Revert suggestions for missing methods in tuples) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #144897 - fee1-dead-contrib:raw_lifetimes_printing, r=fmease print raw lifetime idents with r# This replaces #143185 and fixes #143150 cc ``@fmease``

rustbot assigned SparrowLii Aug 4, 2025

This comment was marked as outdated.

Sign in to view

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Aug 4, 2025

WaffleLapkin reviewed Aug 4, 2025

View reviewed changes

This comment has been minimized.

Sign in to view

fee1-dead force-pushed the raw_lifetimes_printing branch 2 times, most recently from 5805f0a to 9705706 Compare August 4, 2025 13:35

fmease reviewed Aug 4, 2025

View reviewed changes

tests/ui/lifetimes/raw/use-of-undeclared-raw-lifetimes.stderr Outdated Show resolved Hide resolved

fee1-dead force-pushed the raw_lifetimes_printing branch from 9705706 to b74a97e Compare August 4, 2025 14:07

This comment was marked as resolved.

Sign in to view

fee1-dead force-pushed the raw_lifetimes_printing branch from b74a97e to 4d45896 Compare August 16, 2025 14:32

This comment was marked as resolved.

Sign in to view

fmease assigned fmease and unassigned SparrowLii Aug 16, 2025

fmease approved these changes Aug 21, 2025

View reviewed changes

fmease added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 21, 2025

fee1-dead added 2 commits August 22, 2025 12:58

print raw lifetime idents with r#

1e5b5ba

don't print invalid labels with r#

30bb704

fee1-dead force-pushed the raw_lifetimes_printing branch from 4d45896 to f3ff3d3 Compare August 22, 2025 05:07

This comment has been minimized.

Sign in to view

address review comments

4970127

fee1-dead force-pushed the raw_lifetimes_printing branch from f3ff3d3 to 4970127 Compare August 22, 2025 05:16

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 22, 2025

jhpratt added a commit to jhpratt/rust that referenced this pull request Aug 22, 2025

Rollup merge of rust-lang#144897 - fee1-dead-contrib:raw_lifetimes_pr…

d9c5c9d

…inting, r=fmease print raw lifetime idents with r# This replaces rust-lang#143185 and fixes rust-lang#143150 cc `@fmease`

jhpratt mentioned this pull request Aug 22, 2025

Rollup of 20 pull requests #145764

Closed

jhpratt mentioned this pull request Aug 23, 2025

Rollup of 28 pull requests #145773

Merged

bors merged commit 2dbd411 into rust-lang:master Aug 23, 2025
10 checks passed

rustbot added this to the 1.91.0 milestone Aug 23, 2025

rust-timer added a commit that referenced this pull request Aug 23, 2025

Unrolled build for #144897

49ad9e5

Rollup merge of #144897 - fee1-dead-contrib:raw_lifetimes_printing, r=fmease print raw lifetime idents with r# This replaces #143185 and fixes #143150 cc ``@fmease``

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

print raw lifetime idents with r# #144897

print raw lifetime idents with r# #144897

Uh oh!

fee1-dead commented Aug 4, 2025 •

edited by rustbot

Loading

Uh oh!

This comment was marked as outdated.

rustbot commented Aug 4, 2025

Uh oh!

WaffleLapkin Aug 4, 2025

Uh oh!

fee1-dead Aug 4, 2025 •

edited

Loading

Uh oh!

WaffleLapkin Aug 4, 2025

Uh oh!

fee1-dead Aug 4, 2025

Uh oh!

This comment has been minimized.

Uh oh!

This comment was marked as resolved.

This comment was marked as resolved.

fmease left a comment •

edited by rustbot

Loading

Uh oh!

fmease Aug 21, 2025 •

edited

Loading

Uh oh!

Uh oh!

fmease Aug 21, 2025

Uh oh!

rustbot commented Aug 22, 2025

Uh oh!

This comment has been minimized.

fee1-dead commented Aug 22, 2025

Uh oh!

bors commented Aug 22, 2025

Uh oh!

Uh oh!

Uh oh!

print raw lifetime idents with r# #144897

print raw lifetime idents with r# #144897

Uh oh!

Conversation

fee1-dead commented Aug 4, 2025 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment was marked as outdated.

rustbot commented Aug 4, 2025

Uh oh!

WaffleLapkin Aug 4, 2025

Choose a reason for hiding this comment

Uh oh!

fee1-dead Aug 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

WaffleLapkin Aug 4, 2025

Choose a reason for hiding this comment

Uh oh!

fee1-dead Aug 4, 2025

Choose a reason for hiding this comment

Uh oh!

This comment has been minimized.

Uh oh!

This comment was marked as resolved.

This comment was marked as resolved.

fmease left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

fmease Aug 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

fmease Aug 21, 2025

Choose a reason for hiding this comment

Uh oh!

rustbot commented Aug 22, 2025

Uh oh!

This comment has been minimized.

fee1-dead commented Aug 22, 2025

Uh oh!

bors commented Aug 22, 2025

Uh oh!

Uh oh!

Uh oh!

fee1-dead commented Aug 4, 2025 •

edited by rustbot

Loading

fee1-dead Aug 4, 2025 •

edited

Loading

fmease left a comment •

edited by rustbot

Loading

fmease Aug 21, 2025 •

edited

Loading