Skip to content

Commit 2839221

Browse files
xizheyinxizheyin
committed
Add lifetime-aware support for Display impl of Ident
Signed-off-by: xizheyin <xizheyin@smail.nju.edu.cn>
1 parent da16085 commit 2839221

File tree

6 files changed

+69
-32
lines changed

6 files changed

+69
-32
lines changed

‎compiler/rustc_parse/src/errors.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2176,7 +2176,7 @@ pub(crate) struct KeywordLifetime {
21762176
pub(crate) struct InvalidLabel {
21772177
#[primary_span]
21782178
pub span: Span,
2179-
pub name: Symbol,
2179+
pub name: String,
21802180
}
21812181

21822182
#[derive(Diagnostic)]

‎compiler/rustc_parse/src/parser/expr.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3077,7 +3077,10 @@ impl<'a> Parser<'a> {
30773077
if let Some((ident, is_raw)) = self.token.lifetime() {
30783078
// Disallow `'fn`, but with a better error message than `expect_lifetime`.
30793079
if matches!(is_raw, IdentIsRaw::No) && ident.without_first_quote().is_reserved() {
3080-
self.dcx().emit_err(errors::InvalidLabel { span: ident.span, name: ident.name });
3080+
self.dcx().emit_err(errors::InvalidLabel {
3081+
span: ident.span,
3082+
name: ident.name.to_string(),
3083+
});
30813084
}
30823085

30833086
self.bump();

‎compiler/rustc_resolve/src/late/diagnostics.rs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// ignore-tidy-filelength
22

33
use std::borrow::Cow;
4+
use std::fmt::Write;
45
use std::iter;
56
use std::ops::Deref;
67

@@ -3120,7 +3121,7 @@ impl<'ast, 'ra, 'tcx> LateResolutionVisitor<'_, 'ast, 'ra, 'tcx> {
31203121
} else {
31213122
self.suggest_introducing_lifetime(
31223123
&mut err,
3123-
Some(lifetime_ref.ident.name.as_str()),
3124+
Some(lifetime_ref.ident),
31243125
|err, _, span, message, suggestion, span_suggs| {
31253126
err.multipart_suggestion_verbose(
31263127
message,
@@ -3138,7 +3139,7 @@ impl<'ast, 'ra, 'tcx> LateResolutionVisitor<'_, 'ast, 'ra, 'tcx> {
31383139
fn suggest_introducing_lifetime(
31393140
&self,
31403141
err: &mut Diag<'_>,
3141-
name: Option<&str>,
3142+
name: Option<Ident>,
31423143
suggest: impl Fn(
31433144
&mut Diag<'_>,
31443145
bool,
@@ -3185,7 +3186,7 @@ impl<'ast, 'ra, 'tcx> LateResolutionVisitor<'_, 'ast, 'ra, 'tcx> {
31853186
let mut rm_inner_binders: FxIndexSet<Span> = Default::default();
31863187
let (span, sugg) = if span.is_empty() {
31873188
let mut binder_idents: FxIndexSet<Ident> = Default::default();
3188-
binder_idents.insert(Ident::from_str(name.unwrap_or("'a")));
3189+
binder_idents.insert(name.unwrap_or(Ident::from_str("'a")));
31893190

31903191
// We need to special case binders in the following situation:
31913192
// Change `T: for<'a> Trait<T> + 'b` to `for<'a, 'b> T: Trait<T> + 'b`
@@ -3221,7 +3222,7 @@ impl<'ast, 'ra, 'tcx> LateResolutionVisitor<'_, 'ast, 'ra, 'tcx> {
32213222
if i != 0 {
32223223
binders += ", ";
32233224
}
3224-
binders += x.as_str();
3225+
let _ = write!(binders, "{x}");
32253226
binders
32263227
},
32273228
);
@@ -3240,15 +3241,15 @@ impl<'ast, 'ra, 'tcx> LateResolutionVisitor<'_, 'ast, 'ra, 'tcx> {
32403241
.source_map()
32413242
.span_through_char(span, '<')
32423243
.shrink_to_hi();
3243-
let sugg = format!("{}, ", name.unwrap_or("'a"));
3244+
let sugg = format!("{}, ", name.unwrap_or(Ident::from_str("'a")));
32443245
(span, sugg)
32453246
};
32463247

32473248
if higher_ranked {
32483249
let message = Cow::from(format!(
32493250
"consider making the {} lifetime-generic with a new `{}` lifetime",
32503251
kind.descr(),
3251-
name.unwrap_or("'a"),
3252+
name.unwrap_or(Ident::from_str("'a")),
32523253
));
32533254
should_continue = suggest(
32543255
err,

‎compiler/rustc_span/src/symbol.rs

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2473,6 +2473,10 @@ impl Ident {
24732473
pub fn as_str(&self) -> &str {
24742474
self.name.as_str()
24752475
}
2476+
2477+
pub fn as_lifetime(&self) -> Option<Ident> {
2478+
self.name.as_lifetime().map(|sym| Ident::with_dummy_span(sym))
2479+
}
24762480
}
24772481

24782482
impl PartialEq for Ident {
@@ -2542,6 +2546,14 @@ impl IdentPrinter {
25422546

25432547
impl fmt::Display for IdentPrinter {
25442548
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
2549+
if let Some(lifetime) = self.symbol.as_lifetime() {
2550+
f.write_str("'")?;
2551+
if self.is_raw {
2552+
f.write_str("r#")?;
2553+
}
2554+
return fmt::Display::fmt(&lifetime, f);
2555+
}
2556+
25452557
if self.is_raw {
25462558
f.write_str("r#")?;
25472559
} else if self.symbol == kw::DollarCrate {
@@ -2633,6 +2645,11 @@ impl Symbol {
26332645
self == sym::empty
26342646
}
26352647

2648+
pub fn as_lifetime(self) -> Option<Symbol> {
2649+
let name = self.as_str();
2650+
name.strip_prefix("'").map(Symbol::intern)
2651+
}
2652+
26362653
/// This method is supposed to be used in error messages, so it's expected to be
26372654
/// identical to printing the original identifier token written in source code
26382655
/// (`token_to_string`, `Ident::to_string`), except that symbols don't keep the rawness flag
@@ -2863,7 +2880,13 @@ impl Ident {
28632880
/// We see this identifier in a normal identifier position, like variable name or a type.
28642881
/// How was it written originally? Did it use the raw form? Let's try to guess.
28652882
pub fn is_raw_guess(self) -> bool {
2866-
self.name.can_be_raw() && self.is_reserved()
2883+
if self.name == kw::StaticLifetime || self.name == kw::UnderscoreLifetime {
2884+
false
2885+
} else if let Some(lifetime) = self.as_lifetime() {
2886+
lifetime.is_raw_guess()
2887+
} else {
2888+
self.name.can_be_raw() && self.is_reserved()
2889+
}
28672890
}
28682891

28692892
/// Whether this would be the identifier for a tuple field like `self.0`, as

‎tests/ui/lifetimes/lifetime-errors/error-lifetime-name-issue-143150.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
//@ edition: 2021
2-
fn a(_: dyn Trait + 'r#fn) { //~ ERROR use of undeclared lifetime name `'fn` [E0261]
2+
fn a(_: dyn Trait + 'r#fn) { //~ ERROR use of undeclared lifetime name `'r#fn` [E0261]
33

44
}
55

66
trait Trait {}
77

88
#[derive(Eq, PartialEq)]
99
struct Test {
10-
a: &'r#fn str,
11-
//~^ ERROR use of undeclared lifetime name `'fn` [E0261]
12-
//~| ERROR use of undeclared lifetime name `'fn` [E0261]
10+
a: &'r#fn str,
11+
//~^ ERROR use of undeclared lifetime name `'r#fn` [E0261]
12+
//~| ERROR use of undeclared lifetime name `'r#fn` [E0261]
1313
}
1414

1515
trait Trait1<T>
16-
where T: for<'a> Trait1<T> + 'r#fn { } //~ ERROR use of undeclared lifetime name `'fn` [E0261]
16+
where T: for<'a> Trait1<T> + 'r#fn { } //~ ERROR use of undeclared lifetime name `'r#fn` [E0261]
1717

1818

1919

‎tests/ui/lifetimes/lifetime-errors/error-lifetime-name-issue-143150.stderr

Lines changed: 28 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,55 @@
1-
error[E0261]: use of undeclared lifetime name `'fn`
1+
error[E0261]: use of undeclared lifetime name `'r#fn`
22
--> $DIR/error-lifetime-name-issue-143150.rs:2:21
33
|
44
LL | fn a(_: dyn Trait + 'r#fn) {
5-
| - ^^^^^ undeclared lifetime
6-
| |
7-
| help: consider introducing lifetime `'fn` here: `<'fn>`
5+
| ^^^^^ undeclared lifetime
6+
|
7+
help: consider introducing lifetime `'r#fn` here
8+
|
9+
LL | fn a<'r#fn>(_: dyn Trait + 'r#fn) {
10+
| +++++++
811

9-
error[E0261]: use of undeclared lifetime name `'fn`
12+
error[E0261]: use of undeclared lifetime name `'r#fn`
1013
--> $DIR/error-lifetime-name-issue-143150.rs:10:9
1114
|
12-
LL | struct Test {
13-
| - help: consider introducing lifetime `'fn` here: `<'fn>`
14-
LL | a: &'r#fn str,
15+
LL | a: &'r#fn str,
1516
| ^^^^^ undeclared lifetime
17+
|
18+
help: consider introducing lifetime `'r#fn` here
19+
|
20+
LL | struct Test<'r#fn> {
21+
| +++++++
1622

17-
error[E0261]: use of undeclared lifetime name `'fn`
23+
error[E0261]: use of undeclared lifetime name `'r#fn`
1824
--> $DIR/error-lifetime-name-issue-143150.rs:10:9
1925
|
2026
LL | #[derive(Eq, PartialEq)]
21-
| -- lifetime `'fn` is missing in item created through this procedural macro
27+
| -- lifetime `'r#fn` is missing in item created through this procedural macro
2228
LL | struct Test {
23-
| - help: consider introducing lifetime `'fn` here: `<'fn>`
24-
LL | a: &'r#fn str,
29+
LL | a: &'r#fn str,
2530
| ^^^^^ undeclared lifetime
31+
|
32+
help: consider introducing lifetime `'r#fn` here
33+
|
34+
LL | struct Test<'r#fn> {
35+
| +++++++
2636

27-
error[E0261]: use of undeclared lifetime name `'fn`
37+
error[E0261]: use of undeclared lifetime name `'r#fn`
2838
--> $DIR/error-lifetime-name-issue-143150.rs:16:32
2939
|
3040
LL | where T: for<'a> Trait1<T> + 'r#fn { }
3141
| ^^^^^ undeclared lifetime
3242
|
3343
= note: for more information on higher-ranked polymorphism, visit https://doc.rust-lang.org/nomicon/hrtb.html
34-
help: consider making the bound lifetime-generic with a new `'fn` lifetime
44+
help: consider making the bound lifetime-generic with a new `'r#fn` lifetime
3545
|
3646
LL - where T: for<'a> Trait1<T> + 'r#fn { }
37-
LL + where for<'fn, 'a> T: Trait1<T> + 'r#fn { }
47+
LL + where for<'r#fn, 'a> T: Trait1<T> + 'r#fn { }
3848
|
39-
help: consider introducing lifetime `'fn` here
49+
help: consider introducing lifetime `'r#fn` here
4050
|
41-
LL | trait Trait1<'fn, T>
42-
| ++++
51+
LL | trait Trait1<'r#fn, T>
52+
| ++++++
4353

4454
error: aborting due to 4 previous errors
4555

0 commit comments

Comments
 (0)