Skip to content

Commit 5453c03

Browse files
estebankestebank
committed
review comments
1 parent dd8f02c commit 5453c03

21 files changed

+60
-60
lines changed

‎src/librustc_hir/hir.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2262,7 +2262,7 @@ pub struct PolyTraitRef<'hir> {
22622262
/// The `'a` in `for<'a> Foo<&'a T>`.
22632263
pub bound_generic_params: &'hir [GenericParam<'hir>],
22642264

2265-
/// The `Foo<&'a T>` in `for <'a> Foo<&'a T>`.
2265+
/// The `Foo<&'a T>` in `for<'a> Foo<&'a T>`.
22662266
pub trait_ref: TraitRef<'hir>,
22672267

22682268
pub span: Span,

‎src/librustc_resolve/diagnostics.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -1493,20 +1493,20 @@ crate fn add_missing_lifetime_specifiers_label(
14931493
msg = "consider introducing a named lifetime parameter";
14941494
should_break = true;
14951495
match &generics.params {
1496-
[] => (generics.span, "<'r>".to_string()),
1497-
[param, ..] => (param.span.shrink_to_lo(), "'r, ".to_string()),
1496+
[] => (generics.span, "<'a>".to_string()),
1497+
[param, ..] => (param.span.shrink_to_lo(), "'a, ".to_string()),
14981498
}
14991499
}
15001500
MissingLifetimeSpot::HRLT { span, span_type } => {
1501-
msg = "consider introducing a Higher-Ranked lifetime";
1501+
msg = "consider introducing a higher-ranked lifetime";
15021502
should_break = false;
15031503
err.note(
1504-
"for more information on Higher-Ranked lifetimes, visit \
1504+
"for more information on higher-ranked lifetimes, visit \
15051505
https://doc.rust-lang.org/nomicon/hrtb.html",
15061506
);
15071507
let suggestion = match span_type {
1508-
HRLTSpanType::Empty => "for<'r> ",
1509-
HRLTSpanType::Tail => ", 'r",
1508+
HRLTSpanType::Empty => "for<'a> ",
1509+
HRLTSpanType::Tail => ", 'a",
15101510
};
15111511
(*span, suggestion.to_string())
15121512
}
@@ -1515,7 +1515,7 @@ crate fn add_missing_lifetime_specifiers_label(
15151515
if let Ok(snippet) = source_map.span_to_snippet(param.span) {
15161516
if snippet.starts_with("&") && !snippet.starts_with("&'") {
15171517
introduce_suggestion
1518-
.push((param.span, format!("&'r {}", &snippet[1..])));
1518+
.push((param.span, format!("&'a {}", &snippet[1..])));
15191519
}
15201520
}
15211521
}
@@ -1538,13 +1538,13 @@ crate fn add_missing_lifetime_specifiers_label(
15381538
suggest_existing(err, format!("{}<{}>", snippet, name));
15391539
}
15401540
(0, _, Some("&")) => {
1541-
suggest_new(err, "&'r ");
1541+
suggest_new(err, "&'a ");
15421542
}
15431543
(0, _, Some("'_")) => {
1544-
suggest_new(err, "'r");
1544+
suggest_new(err, "'a");
15451545
}
15461546
(0, _, Some(snippet)) if !snippet.ends_with(">") => {
1547-
suggest_new(err, &format!("{}<'r>", snippet));
1547+
suggest_new(err, &format!("{}<'a>", snippet));
15481548
}
15491549
_ => {
15501550
err.span_label(span, "expected lifetime parameter");

‎src/librustc_resolve/lifetimes.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1873,7 +1873,7 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {
18731873
err.span_suggestion(
18741874
*span,
18751875
&format!(
1876-
"consider introducing a Higher-Ranked lifetime `{}` here",
1876+
"consider introducing a higher-ranked lifetime `{}` here",
18771877
lifetime_ref
18781878
),
18791879
match span_type {
@@ -1884,7 +1884,7 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {
18841884
Applicability::MaybeIncorrect,
18851885
);
18861886
err.note(
1887-
"for more information on Higher-Ranked lifetimes, visit \
1887+
"for more information on higher-ranked lifetimes, visit \
18881888
https://doc.rust-lang.org/nomicon/hrtb.html",
18891889
);
18901890
}

‎src/test/ui/error-codes/E0106.stderr

+7-7
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ LL | x: &bool,
66
|
77
help: consider introducing a named lifetime parameter
88
|
9-
LL | struct Foo<'r> {
10-
LL | x: &'r bool,
9+
LL | struct Foo<'a> {
10+
LL | x: &'a bool,
1111
|
1212

1313
error[E0106]: missing lifetime specifier
@@ -18,9 +18,9 @@ LL | B(&bool),
1818
|
1919
help: consider introducing a named lifetime parameter
2020
|
21-
LL | enum Bar<'r> {
21+
LL | enum Bar<'a> {
2222
LL | A(u8),
23-
LL | B(&'r bool),
23+
LL | B(&'a bool),
2424
|
2525

2626
error[E0106]: missing lifetime specifier
@@ -31,7 +31,7 @@ LL | type MyStr = &str;
3131
|
3232
help: consider introducing a named lifetime parameter
3333
|
34-
LL | type MyStr<'r> = &'r str;
34+
LL | type MyStr<'a> = &'a str;
3535
| ^^^^ ^^^
3636

3737
error[E0106]: missing lifetime specifier
@@ -42,8 +42,8 @@ LL | baz: Baz,
4242
|
4343
help: consider introducing a named lifetime parameter
4444
|
45-
LL | struct Quux<'r> {
46-
LL | baz: Baz<'r>,
45+
LL | struct Quux<'a> {
46+
LL | baz: Baz<'a>,
4747
|
4848

4949
error[E0106]: missing lifetime specifiers

‎src/test/ui/impl-header-lifetime-elision/assoc-type.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ LL | type Output = &i32;
66
|
77
help: consider introducing a named lifetime parameter
88
|
9-
LL | type Output<'r> = &'r i32;
9+
LL | type Output<'a> = &'a i32;
1010
| ^^^^ ^^^
1111

1212
error[E0106]: missing lifetime specifier
@@ -17,7 +17,7 @@ LL | type Output = &'_ i32;
1717
|
1818
help: consider introducing a named lifetime parameter
1919
|
20-
LL | type Output<'r> = &'r i32;
20+
LL | type Output<'a> = &'a i32;
2121
| ^^^^ ^^
2222

2323
error: aborting due to 2 previous errors

‎src/test/ui/in-band-lifetimes/issue-61124-anon-lifetime-in-struct-declaration.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ LL | struct Heartbreak(Betrayal);
66
|
77
help: consider introducing a named lifetime parameter
88
|
9-
LL | struct Heartbreak<'r>(Betrayal<'r>);
9+
LL | struct Heartbreak<'a>(Betrayal<'a>);
1010
| ^^^^ ^^^^^^^^^^^^
1111

1212
error: aborting due to previous error

‎src/test/ui/issues/issue-19707.stderr

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ LL | type Foo = fn(&u8, &u8) -> &u8;
1111
| ^^^ ^^^
1212
help: consider introducing a named lifetime parameter
1313
|
14-
LL | type Foo<'r> = fn(&'r u8, &'r u8) -> &'r u8;
14+
LL | type Foo<'a> = fn(&'a u8, &'a u8) -> &'a u8;
1515
| ^^^^ ^^^^^^ ^^^^^^ ^^^
1616

1717
error[E0106]: missing lifetime specifier
@@ -25,14 +25,14 @@ help: this function's return type contains a borrowed value, but the signature d
2525
|
2626
LL | fn bar<F: Fn(&u8, &u8) -> &u8>(f: &F) {}
2727
| ^^^ ^^^
28-
= note: for more information on Higher-Ranked lifetimes, visit https://doc.rust-lang.org/nomicon/hrtb.html
29-
help: consider introducing a Higher-Ranked lifetime
28+
= note: for more information on higher-ranked lifetimes, visit https://doc.rust-lang.org/nomicon/hrtb.html
29+
help: consider introducing a higher-ranked lifetime
3030
|
31-
LL | fn bar<F: for<'r> Fn(&'r u8, &'r u8) -> &'r u8>(f: &F) {}
31+
LL | fn bar<F: for<'a> Fn(&'a u8, &'a u8) -> &'a u8>(f: &F) {}
3232
| ^^^^^^^ ^^^^^^ ^^^^^^ ^^^
3333
help: consider introducing a named lifetime parameter
3434
|
35-
LL | fn bar<'r, F: Fn(&'r u8, &'r u8) -> &'r u8>(f: &F) {}
35+
LL | fn bar<'a, F: Fn(&'a u8, &'a u8) -> &'a u8>(f: &F) {}
3636
| ^^^ ^^^^^^ ^^^^^^ ^^^
3737

3838
error: aborting due to 2 previous errors

‎src/test/ui/issues/issue-26638.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ LL | fn parse_type(iter: Box<dyn Iterator<Item=&str>+'static>) -> &str { iter.ne
1111
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1212
help: consider introducing a named lifetime parameter
1313
|
14-
LL | fn parse_type<'r>(iter: Box<dyn Iterator<Item=&str>+'static>) -> &'r str { iter.next() }
14+
LL | fn parse_type<'a>(iter: Box<dyn Iterator<Item=&str>+'static>) -> &'a str { iter.next() }
1515
| ^^^^ ^^^
1616

1717
error[E0106]: missing lifetime specifier

‎src/test/ui/issues/issue-30255.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ LL | fn f(a: &S, b: i32) -> &i32 {
1111
| ^^
1212
help: consider introducing a named lifetime parameter
1313
|
14-
LL | fn f<'r>(a: &'r S, b: i32) -> &'r i32 {
14+
LL | fn f<'a>(a: &'a S, b: i32) -> &'a i32 {
1515
| ^^^^ ^^^^^ ^^^
1616

1717
error[E0106]: missing lifetime specifier
@@ -27,7 +27,7 @@ LL | fn g(a: &S, b: bool, c: &i32) -> &i32 {
2727
| ^^ ^^^^
2828
help: consider introducing a named lifetime parameter
2929
|
30-
LL | fn g<'r>(a: &'r S, b: bool, c: &'r i32) -> &'r i32 {
30+
LL | fn g<'a>(a: &'a S, b: bool, c: &'a i32) -> &'a i32 {
3131
| ^^^^ ^^^^^ ^^^^^^^ ^^^
3232

3333
error[E0106]: missing lifetime specifier
@@ -43,7 +43,7 @@ LL | fn h(a: &bool, b: bool, c: &S, d: &i32) -> &i32 {
4343
| ^^^^^ ^^ ^^^^
4444
help: consider introducing a named lifetime parameter
4545
|
46-
LL | fn h<'r>(a: &'r bool, b: bool, c: &'r S, d: &'r i32) -> &'r i32 {
46+
LL | fn h<'a>(a: &'a bool, b: bool, c: &'a S, d: &'a i32) -> &'a i32 {
4747
| ^^^^ ^^^^^^^^ ^^^^^ ^^^^^^^ ^^^
4848

4949
error: aborting due to 3 previous errors

‎src/test/ui/lifetimes/lifetime-elision-return-type-requires-explicit-lifetime.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ LL | fn g(_x: &isize, _y: &isize) -> &isize {
1919
| ^^^^^^ ^^^^^^
2020
help: consider introducing a named lifetime parameter
2121
|
22-
LL | fn g<'r>(_x: &'r isize, _y: &'r isize) -> &'r isize {
22+
LL | fn g<'a>(_x: &'a isize, _y: &'a isize) -> &'a isize {
2323
| ^^^^ ^^^^^^^^^ ^^^^^^^^^ ^^^
2424

2525
error[E0106]: missing lifetime specifier
@@ -35,7 +35,7 @@ LL | fn h(_x: &Foo) -> &isize {
3535
| ^^^^
3636
help: consider introducing a named lifetime parameter
3737
|
38-
LL | fn h<'r>(_x: &'r Foo) -> &'r isize {
38+
LL | fn h<'a>(_x: &'a Foo) -> &'a isize {
3939
| ^^^^ ^^^^^^^ ^^^
4040

4141
error[E0106]: missing lifetime specifier

‎src/test/ui/lifetimes/lifetime-errors/ex1b-return-no-names-if-else.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ LL | fn foo(x: &i32, y: &i32) -> &i32 {
1111
| ^^^^ ^^^^
1212
help: consider introducing a named lifetime parameter
1313
|
14-
LL | fn foo<'r>(x: &'r i32, y: &'r i32) -> &'r i32 {
14+
LL | fn foo<'a>(x: &'a i32, y: &'a i32) -> &'a i32 {
1515
| ^^^^ ^^^^^^^ ^^^^^^^ ^^^
1616

1717
error: aborting due to previous error

‎src/test/ui/proc-macro/item-error.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ LL | a: &u64
66
|
77
help: consider introducing a named lifetime parameter
88
|
9-
LL | struct A<'r> {
10-
LL | a: &'r u64
9+
LL | struct A<'a> {
10+
LL | a: &'a u64
1111
|
1212

1313
error: aborting due to previous error

‎src/test/ui/regions/regions-in-enums-anon.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ LL | Bar(&isize)
66
|
77
help: consider introducing a named lifetime parameter
88
|
9-
LL | enum Foo<'r> {
10-
LL | Bar(&'r isize)
9+
LL | enum Foo<'a> {
10+
LL | Bar(&'a isize)
1111
|
1212

1313
error: aborting due to previous error

‎src/test/ui/regions/regions-in-structs-anon.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ LL | x: &isize
66
|
77
help: consider introducing a named lifetime parameter
88
|
9-
LL | struct Foo<'r> {
10-
LL | x: &'r isize
9+
LL | struct Foo<'a> {
10+
LL | x: &'a isize
1111
|
1212

1313
error: aborting due to previous error

‎src/test/ui/regions/regions-name-undeclared.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,12 @@ error[E0261]: use of undeclared lifetime name `'b`
8989
LL | ... &'b isize,
9090
| ^^ undeclared lifetime
9191
|
92-
= note: for more information on Higher-Ranked lifetimes, visit https://doc.rust-lang.org/nomicon/hrtb.html
92+
= note: for more information on higher-ranked lifetimes, visit https://doc.rust-lang.org/nomicon/hrtb.html
9393
help: consider introducing lifetime `'b` here
9494
|
9595
LL | fn fn_types<'b>(a: &'a isize,
9696
| ^^^^
97-
help: consider introducing a Higher-Ranked lifetime `'b` here
97+
help: consider introducing a higher-ranked lifetime `'b` here
9898
|
9999
LL | b: Box<dyn for<'a, 'b> FnOnce(&'a isize,
100100
| ^^^^
@@ -105,12 +105,12 @@ error[E0261]: use of undeclared lifetime name `'b`
105105
LL | ... &'b isize)>,
106106
| ^^ undeclared lifetime
107107
|
108-
= note: for more information on Higher-Ranked lifetimes, visit https://doc.rust-lang.org/nomicon/hrtb.html
108+
= note: for more information on higher-ranked lifetimes, visit https://doc.rust-lang.org/nomicon/hrtb.html
109109
help: consider introducing lifetime `'b` here
110110
|
111111
LL | fn fn_types<'b>(a: &'a isize,
112112
| ^^^^
113-
help: consider introducing a Higher-Ranked lifetime `'b` here
113+
help: consider introducing a higher-ranked lifetime `'b` here
114114
|
115115
LL | b: Box<dyn for<'a, 'b> FnOnce(&'a isize,
116116
| ^^^^

‎src/test/ui/suggestions/fn-missing-lifetime-in-item.stderr

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ error[E0261]: use of undeclared lifetime name `'a`
44
LL | struct S1<F: Fn(&i32, &i32) -> &'a i32>(F);
55
| ^^ undeclared lifetime
66
|
7-
= note: for more information on Higher-Ranked lifetimes, visit https://doc.rust-lang.org/nomicon/hrtb.html
7+
= note: for more information on higher-ranked lifetimes, visit https://doc.rust-lang.org/nomicon/hrtb.html
88
help: consider introducing lifetime `'a` here
99
|
1010
LL | struct S1<'a, F: Fn(&i32, &i32) -> &'a i32>(F);
1111
| ^^^
12-
help: consider introducing a Higher-Ranked lifetime `'a` here
12+
help: consider introducing a higher-ranked lifetime `'a` here
1313
|
1414
LL | struct S1<F: for<'a> Fn(&i32, &i32) -> &'a i32>(F);
1515
| ^^^^^^^
@@ -25,14 +25,14 @@ help: this function's return type contains a borrowed value, but the signature d
2525
|
2626
LL | struct S2<F: Fn(&i32, &i32) -> &i32>(F);
2727
| ^^^^ ^^^^
28-
= note: for more information on Higher-Ranked lifetimes, visit https://doc.rust-lang.org/nomicon/hrtb.html
29-
help: consider introducing a Higher-Ranked lifetime
28+
= note: for more information on higher-ranked lifetimes, visit https://doc.rust-lang.org/nomicon/hrtb.html
29+
help: consider introducing a higher-ranked lifetime
3030
|
31-
LL | struct S2<F: for<'r> Fn(&'r i32, &'r i32) -> &'r i32>(F);
31+
LL | struct S2<F: for<'a> Fn(&'a i32, &'a i32) -> &'a i32>(F);
3232
| ^^^^^^^ ^^^^^^^ ^^^^^^^ ^^^
3333
help: consider introducing a named lifetime parameter
3434
|
35-
LL | struct S2<'r, F: Fn(&'r i32, &'r i32) -> &'r i32>(F);
35+
LL | struct S2<'a, F: Fn(&'a i32, &'a i32) -> &'a i32>(F);
3636
| ^^^ ^^^^^^^ ^^^^^^^ ^^^
3737

3838
error[E0582]: binding for associated type `Output` references lifetime `'a`, which does not appear in the trait input types

‎src/test/ui/unboxed-closures/unboxed-closure-sugar-lifetime-elision.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ LL | let _: dyn Foo(&isize, &usize) -> &usize;
1111
| ^^^^^^ ^^^^^^
1212
help: consider introducing a named lifetime parameter
1313
|
14-
LL | fn main<'r>() {
14+
LL | fn main<'a>() {
1515
LL | eq::< dyn for<'a> Foo<(&'a isize,), Output=&'a isize>,
1616
LL | dyn Foo(&isize) -> &isize >();
1717
LL | eq::< dyn for<'a> Foo<(&'a isize,), Output=(&'a isize, &'a isize)>,

‎src/test/ui/underscore-lifetime/dyn-trait-underscore-in-struct.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ LL | x: Box<dyn Debug + '_>,
66
|
77
help: consider introducing a named lifetime parameter
88
|
9-
LL | struct Foo<'r> {
10-
LL | x: Box<dyn Debug + 'r>,
9+
LL | struct Foo<'a> {
10+
LL | x: Box<dyn Debug + 'a>,
1111
|
1212

1313
error[E0228]: the lifetime bound for this object type cannot be deduced from context; please supply an explicit bound

‎src/test/ui/underscore-lifetime/in-fn-return-illegal.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ LL | fn foo(x: &u32, y: &u32) -> &'_ u32 { loop { } }
1111
| ^^^^ ^^^^
1212
help: consider introducing a named lifetime parameter
1313
|
14-
LL | fn foo<'r>(x: &'r u32, y: &'r u32) -> &'r u32 { loop { } }
14+
LL | fn foo<'a>(x: &'a u32, y: &'a u32) -> &'a u32 { loop { } }
1515
| ^^^^ ^^^^^^^ ^^^^^^^ ^^
1616

1717
error: aborting due to previous error

‎src/test/ui/underscore-lifetime/in-struct.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ LL | x: &'_ u32,
66
|
77
help: consider introducing a named lifetime parameter
88
|
9-
LL | struct Foo<'r> {
10-
LL | x: &'r u32,
9+
LL | struct Foo<'a> {
10+
LL | x: &'a u32,
1111
|
1212

1313
error[E0106]: missing lifetime specifier
@@ -18,8 +18,8 @@ LL | Variant(&'_ u32),
1818
|
1919
help: consider introducing a named lifetime parameter
2020
|
21-
LL | enum Bar<'r> {
22-
LL | Variant(&'r u32),
21+
LL | enum Bar<'a> {
22+
LL | Variant(&'a u32),
2323
|
2424

2525
error: aborting due to 2 previous errors

‎src/test/ui/underscore-lifetime/underscore-lifetime-binders.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ LL | fn foo2(_: &'_ u8, y: &'_ u8) -> &'_ u8 { y }
3737
| ^^^^^^ ^^^^^^
3838
help: consider introducing a named lifetime parameter
3939
|
40-
LL | fn foo2<'r>(_: &'_ u8, y: &'_ u8) -> &'r u8 { y }
40+
LL | fn foo2<'a>(_: &'_ u8, y: &'_ u8) -> &'a u8 { y }
4141
| ^^^^ ^^
4242

4343
error: aborting due to 5 previous errors

0 commit comments

Comments
 (0)