Skip to content

Commit c2ae4de

Browse files
CentrilCentril
authored
Rollup merge of rust-lang#65292 - JohnTitor:add-backticks, r=varkor,Centril
Print lifetimes with backticks Fixes rust-lang#65287 r? @varkor
2 parents 1ac0028 + 2ae5e34 commit c2ae4de

File tree

115 files changed

+260
-260
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+260
-260
lines changed

‎src/librustc/infer/error_reporting/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ impl<'tcx> TyCtxt<'tcx> {
200200
{
201201
sp = param.span;
202202
}
203-
(format!("the lifetime {} as defined on", br.name), sp)
203+
(format!("the lifetime `{}` as defined on", br.name), sp)
204204
}
205205
ty::ReFree(ty::FreeRegion {
206206
bound_region: ty::BoundRegion::BrNamed(_, name),
@@ -213,15 +213,15 @@ impl<'tcx> TyCtxt<'tcx> {
213213
{
214214
sp = param.span;
215215
}
216-
(format!("the lifetime {} as defined on", name), sp)
216+
(format!("the lifetime `{}` as defined on", name), sp)
217217
}
218218
ty::ReFree(ref fr) => match fr.bound_region {
219219
ty::BrAnon(idx) => (
220220
format!("the anonymous lifetime #{} defined on", idx + 1),
221221
self.hir().span(node),
222222
),
223223
_ => (
224-
format!("the lifetime {} as defined on", region),
224+
format!("the lifetime `{}` as defined on", region),
225225
cm.def_span(self.hir().span(node)),
226226
),
227227
},

‎src/test/ui/associated-const/associated-const-impl-wrong-lifetime.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ LL | const NAME: &'a str = "unit";
66
|
77
= note: expected type `&'static str`
88
found type `&'a str`
9-
note: the lifetime 'a as defined on the impl at 6:6...
9+
note: the lifetime `'a` as defined on the impl at 6:6...
1010
--> $DIR/associated-const-impl-wrong-lifetime.rs:6:6
1111
|
1212
LL | impl<'a> Foo for &'a () {

‎src/test/ui/associated-types/cache/project-fn-ret-contravariant.transmute.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error[E0495]: cannot infer an appropriate lifetime due to conflicting requiremen
44
LL | bar(foo, x)
55
| ^^^
66
|
7-
note: first, the lifetime cannot outlive the lifetime 'a as defined on the function body at 37:8...
7+
note: first, the lifetime cannot outlive the lifetime `'a` as defined on the function body at 37:8...
88
--> $DIR/project-fn-ret-contravariant.rs:37:8
99
|
1010
LL | fn baz<'a,'b>(x: &'a u32) -> &'static u32 {

‎src/test/ui/associated-types/cache/project-fn-ret-invariant.transmute.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error[E0495]: cannot infer an appropriate lifetime due to conflicting requiremen
44
LL | bar(foo, x)
55
| ^^^
66
|
7-
note: first, the lifetime cannot outlive the lifetime 'a as defined on the function body at 44:8...
7+
note: first, the lifetime cannot outlive the lifetime `'a` as defined on the function body at 44:8...
88
--> $DIR/project-fn-ret-invariant.rs:44:8
99
|
1010
LL | fn baz<'a,'b>(x: Type<'a>) -> Type<'static> {

‎src/test/ui/async-await/issues/issue-63388-2.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ LL | foo: &dyn Foo, bar: &'a dyn Foo
1515
LL | foo
1616
| --- this return type evaluates to the `'static` lifetime...
1717
|
18-
note: ...can't outlive the lifetime '_ as defined on the method body at 11:14
18+
note: ...can't outlive the lifetime `'_` as defined on the method body at 11:14
1919
--> $DIR/issue-63388-2.rs:11:14
2020
|
2121
LL | foo: &dyn Foo, bar: &'a dyn Foo
2222
| ^
23-
help: you can add a constraint to the return type to make it last less than `'static` and match the lifetime '_ as defined on the method body at 11:14
23+
help: you can add a constraint to the return type to make it last less than `'static` and match the lifetime `'_` as defined on the method body at 11:14
2424
|
2525
LL | foo + '_
2626
|

‎src/test/ui/borrowck/regions-bound-missing-bound-in-impl.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ LL | fn wrong_bound1<'b,'c,'d:'a+'c>(self, b: Inv<'b>, c: Inv<'c>, d: Inv<'d
2424
|
2525
= note: expected type `fn(&'a isize, Inv<'c>, Inv<'c>, Inv<'d>)`
2626
found type `fn(&'a isize, Inv<'_>, Inv<'c>, Inv<'d>)`
27-
note: the lifetime 'c as defined on the method body at 27:24...
27+
note: the lifetime `'c` as defined on the method body at 27:24...
2828
--> $DIR/regions-bound-missing-bound-in-impl.rs:27:24
2929
|
3030
LL | fn wrong_bound1<'b,'c,'d:'a+'c>(self, b: Inv<'b>, c: Inv<'c>, d: Inv<'d>) {
3131
| ^^
32-
note: ...does not necessarily outlive the lifetime 'c as defined on the method body at 27:24
32+
note: ...does not necessarily outlive the lifetime `'c` as defined on the method body at 27:24
3333
--> $DIR/regions-bound-missing-bound-in-impl.rs:27:24
3434
|
3535
LL | fn wrong_bound1<'b,'c,'d:'a+'c>(self, b: Inv<'b>, c: Inv<'c>, d: Inv<'d>) {

‎src/test/ui/c-variadic/variadic-ffi-4.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ LL | pub unsafe extern "C" fn no_escape0<'f>(_: usize, ap: ...) -> VaListImpl<
1414
LL | | ap
1515
LL | | }
1616
| |_^
17-
note: ...does not necessarily outlive the lifetime 'f as defined on the function body at 7:37
17+
note: ...does not necessarily outlive the lifetime `'f` as defined on the function body at 7:37
1818
--> $DIR/variadic-ffi-4.rs:7:37
1919
|
2020
LL | pub unsafe extern "C" fn no_escape0<'f>(_: usize, ap: ...) -> VaListImpl<'f> {

‎src/test/ui/closure-expected-type/expect-fn-supply-fn.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ note: the anonymous lifetime #2 defined on the body at 14:48...
1111
|
1212
LL | with_closure_expecting_fn_with_free_region(|x: fn(&'x u32), y| {});
1313
| ^^^^^^^^^^^^^^^^^^^^^^
14-
note: ...does not necessarily outlive the lifetime 'x as defined on the function body at 11:36
14+
note: ...does not necessarily outlive the lifetime `'x` as defined on the function body at 11:36
1515
--> $DIR/expect-fn-supply-fn.rs:11:36
1616
|
1717
LL | fn expect_free_supply_free_from_fn<'x>(x: &'x u32) {
@@ -25,7 +25,7 @@ LL | with_closure_expecting_fn_with_free_region(|x: fn(&'x u32), y| {});
2525
|
2626
= note: expected type `fn(&u32)`
2727
found type `fn(&'x u32)`
28-
note: the lifetime 'x as defined on the function body at 11:36...
28+
note: the lifetime `'x` as defined on the function body at 11:36...
2929
--> $DIR/expect-fn-supply-fn.rs:11:36
3030
|
3131
LL | fn expect_free_supply_free_from_fn<'x>(x: &'x u32) {

‎src/test/ui/closures/closure-expected-type/expect-region-supply-region.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ LL | |
3838
LL | |
3939
LL | | });
4040
| |_____^
41-
note: ...does not necessarily outlive the lifetime 'x as defined on the function body at 32:30
41+
note: ...does not necessarily outlive the lifetime `'x` as defined on the function body at 32:30
4242
--> $DIR/expect-region-supply-region.rs:32:30
4343
|
4444
LL | fn expect_bound_supply_named<'x>() {
@@ -52,7 +52,7 @@ LL | closure_expecting_bound(|x: &'x u32| {
5252
|
5353
= note: expected type `&u32`
5454
found type `&'x u32`
55-
note: the lifetime 'x as defined on the function body at 32:30...
55+
note: the lifetime `'x` as defined on the function body at 32:30...
5656
--> $DIR/expect-region-supply-region.rs:32:30
5757
|
5858
LL | fn expect_bound_supply_named<'x>() {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ error[E0478]: lifetime bound not satisfied
44
LL | child: Box<dyn Wedding<'kiss> + 'SnowWhite>,
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
66
|
7-
note: lifetime parameter instantiated with the lifetime 'SnowWhite as defined on the struct at 3:22
7+
note: lifetime parameter instantiated with the lifetime `'SnowWhite` as defined on the struct at 3:22
88
--> $DIR/E0478.rs:3:22
99
|
1010
LL | struct Prince<'kiss, 'SnowWhite> {
1111
| ^^^^^^^^^^
12-
note: but lifetime parameter must outlive the lifetime 'kiss as defined on the struct at 3:15
12+
note: but lifetime parameter must outlive the lifetime `'kiss` as defined on the struct at 3:15
1313
--> $DIR/E0478.rs:3:15
1414
|
1515
LL | struct Prince<'kiss, 'SnowWhite> {

‎src/test/ui/explicit/explicit-self-lifetime-mismatch.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ LL | Foo<'b,'a>
66
|
77
= note: expected type `Foo<'a, 'b>`
88
found type `Foo<'b, 'a>`
9-
note: the lifetime 'b as defined on the impl at 6:9...
9+
note: the lifetime `'b` as defined on the impl at 6:9...
1010
--> $DIR/explicit-self-lifetime-mismatch.rs:6:9
1111
|
1212
LL | impl<'a,'b> Foo<'a,'b> {
1313
| ^^
14-
note: ...does not necessarily outlive the lifetime 'a as defined on the impl at 6:6
14+
note: ...does not necessarily outlive the lifetime `'a` as defined on the impl at 6:6
1515
--> $DIR/explicit-self-lifetime-mismatch.rs:6:6
1616
|
1717
LL | impl<'a,'b> Foo<'a,'b> {
@@ -25,12 +25,12 @@ LL | Foo<'b,'a>
2525
|
2626
= note: expected type `Foo<'a, 'b>`
2727
found type `Foo<'b, 'a>`
28-
note: the lifetime 'a as defined on the impl at 6:6...
28+
note: the lifetime `'a` as defined on the impl at 6:6...
2929
--> $DIR/explicit-self-lifetime-mismatch.rs:6:6
3030
|
3131
LL | impl<'a,'b> Foo<'a,'b> {
3232
| ^^
33-
note: ...does not necessarily outlive the lifetime 'b as defined on the impl at 6:9
33+
note: ...does not necessarily outlive the lifetime `'b` as defined on the impl at 6:9
3434
--> $DIR/explicit-self-lifetime-mismatch.rs:6:9
3535
|
3636
LL | impl<'a,'b> Foo<'a,'b> {

‎src/test/ui/hr-subtype/hr-subtype.free_inv_x_vs_free_inv_y.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ LL | | fn(Inv<'y>)) }
1010
|
1111
= note: expected type `std::option::Option<fn(Inv<'y>)>`
1212
found type `std::option::Option<fn(Inv<'x>)>`
13-
note: the lifetime 'x as defined on the function body at 32:20...
13+
note: the lifetime `'x` as defined on the function body at 32:20...
1414
--> $DIR/hr-subtype.rs:32:20
1515
|
1616
LL | fn subtype<'x,'y:'x,'z:'y>() {
@@ -19,7 +19,7 @@ LL | fn subtype<'x,'y:'x,'z:'y>() {
1919
LL | / check! { free_inv_x_vs_free_inv_y: (fn(Inv<'x>),
2020
LL | | fn(Inv<'y>)) }
2121
| |__________________________________________________- in this macro invocation
22-
note: ...does not necessarily outlive the lifetime 'y as defined on the function body at 32:23
22+
note: ...does not necessarily outlive the lifetime `'y` as defined on the function body at 32:23
2323
--> $DIR/hr-subtype.rs:32:23
2424
|
2525
LL | fn subtype<'x,'y:'x,'z:'y>() {
@@ -41,7 +41,7 @@ LL | | fn(Inv<'y>)) }
4141
|
4242
= note: expected type `std::option::Option<fn(Inv<'x>)>`
4343
found type `std::option::Option<fn(Inv<'y>)>`
44-
note: the lifetime 'x as defined on the function body at 38:22...
44+
note: the lifetime `'x` as defined on the function body at 38:22...
4545
--> $DIR/hr-subtype.rs:38:22
4646
|
4747
LL | fn supertype<'x,'y:'x,'z:'y>() {
@@ -50,7 +50,7 @@ LL | fn supertype<'x,'y:'x,'z:'y>() {
5050
LL | / check! { free_inv_x_vs_free_inv_y: (fn(Inv<'x>),
5151
LL | | fn(Inv<'y>)) }
5252
| |__________________________________________________- in this macro invocation
53-
note: ...does not necessarily outlive the lifetime 'y as defined on the function body at 38:25
53+
note: ...does not necessarily outlive the lifetime `'y` as defined on the function body at 38:25
5454
--> $DIR/hr-subtype.rs:38:25
5555
|
5656
LL | fn supertype<'x,'y:'x,'z:'y>() {

‎src/test/ui/hr-subtype/hr-subtype.free_x_vs_free_y.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ LL | | fn(&'y u32)) }
1010
|
1111
= note: expected type `std::option::Option<fn(&'x u32)>`
1212
found type `std::option::Option<fn(&'y u32)>`
13-
note: the lifetime 'x as defined on the function body at 38:22...
13+
note: the lifetime `'x` as defined on the function body at 38:22...
1414
--> $DIR/hr-subtype.rs:38:22
1515
|
1616
LL | fn supertype<'x,'y:'x,'z:'y>() {
@@ -19,7 +19,7 @@ LL | fn supertype<'x,'y:'x,'z:'y>() {
1919
LL | / check! { free_x_vs_free_y: (fn(&'x u32),
2020
LL | | fn(&'y u32)) }
2121
| |__________________________________________- in this macro invocation
22-
note: ...does not necessarily outlive the lifetime 'y as defined on the function body at 38:25
22+
note: ...does not necessarily outlive the lifetime `'y` as defined on the function body at 38:25
2323
--> $DIR/hr-subtype.rs:38:25
2424
|
2525
LL | fn supertype<'x,'y:'x,'z:'y>() {

‎src/test/ui/impl-header-lifetime-elision/dyn-trait.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error[E0495]: cannot infer an appropriate lifetime due to conflicting requiremen
44
LL | static_val(x);
55
| ^
66
|
7-
note: first, the lifetime cannot outlive the lifetime 'a as defined on the function body at 19:26...
7+
note: first, the lifetime cannot outlive the lifetime `'a` as defined on the function body at 19:26...
88
--> $DIR/dyn-trait.rs:19:26
99
|
1010
LL | fn with_dyn_debug_static<'a>(x: Box<dyn Debug + 'a>) {

‎src/test/ui/impl-trait/hidden-lifetimes.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error[E0700]: hidden type for `impl Trait` captures lifetime that does not appea
44
LL | fn hide_ref<'a, 'b, T: 'static>(x: &'a mut &'b T) -> impl Swap + 'a {
55
| ^^^^^^^^^^^^^^
66
|
7-
note: hidden type `&'a mut &'b T` captures the lifetime 'b as defined on the function body at 28:17
7+
note: hidden type `&'a mut &'b T` captures the lifetime `'b` as defined on the function body at 28:17
88
--> $DIR/hidden-lifetimes.rs:28:17
99
|
1010
LL | fn hide_ref<'a, 'b, T: 'static>(x: &'a mut &'b T) -> impl Swap + 'a {
@@ -16,7 +16,7 @@ error[E0700]: hidden type for `impl Trait` captures lifetime that does not appea
1616
LL | fn hide_rc_refcell<'a, 'b: 'a, T: 'static>(x: Rc<RefCell<&'b T>>) -> impl Swap + 'a {
1717
| ^^^^^^^^^^^^^^
1818
|
19-
note: hidden type `std::rc::Rc<std::cell::RefCell<&'b T>>` captures the lifetime 'b as defined on the function body at 45:24
19+
note: hidden type `std::rc::Rc<std::cell::RefCell<&'b T>>` captures the lifetime `'b` as defined on the function body at 45:24
2020
--> $DIR/hidden-lifetimes.rs:45:24
2121
|
2222
LL | fn hide_rc_refcell<'a, 'b: 'a, T: 'static>(x: Rc<RefCell<&'b T>>) -> impl Swap + 'a {

‎src/test/ui/impl-trait/must_outlive_least_region_or_bound.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ LL | fn explicit<'a>(x: &'a i32) -> impl Copy { x }
2424
| |
2525
| this return type evaluates to the `'static` lifetime...
2626
|
27-
note: ...can't outlive the lifetime 'a as defined on the function body at 6:13
27+
note: ...can't outlive the lifetime `'a` as defined on the function body at 6:13
2828
--> $DIR/must_outlive_least_region_or_bound.rs:6:13
2929
|
3030
LL | fn explicit<'a>(x: &'a i32) -> impl Copy { x }
3131
| ^^
32-
help: you can add a constraint to the return type to make it last less than `'static` and match the lifetime 'a as defined on the function body at 6:13
32+
help: you can add a constraint to the return type to make it last less than `'static` and match the lifetime `'a` as defined on the function body at 6:13
3333
|
3434
LL | fn explicit<'a>(x: &'a i32) -> impl Copy + 'a { x }
3535
| ^^^^^^^^^^^^^^
@@ -42,12 +42,12 @@ LL | fn with_bound<'a>(x: &'a i32) -> impl LifetimeTrait<'a> + 'static { x }
4242
| |
4343
| this return type evaluates to the `'static` lifetime...
4444
|
45-
note: ...can't outlive the lifetime 'a as defined on the function body at 12:15
45+
note: ...can't outlive the lifetime `'a` as defined on the function body at 12:15
4646
--> $DIR/must_outlive_least_region_or_bound.rs:12:15
4747
|
4848
LL | fn with_bound<'a>(x: &'a i32) -> impl LifetimeTrait<'a> + 'static { x }
4949
| ^^
50-
help: you can add a constraint to the return type to make it last less than `'static` and match the lifetime 'a as defined on the function body at 12:15
50+
help: you can add a constraint to the return type to make it last less than `'static` and match the lifetime `'a` as defined on the function body at 12:15
5151
|
5252
LL | fn with_bound<'a>(x: &'a i32) -> impl LifetimeTrait<'a> + 'static + 'a { x }
5353
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

‎src/test/ui/impl-trait/region-escape-via-bound.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error[E0700]: hidden type for `impl Trait` captures lifetime that does not appea
44
LL | fn foo(x: Cell<&'x u32>) -> impl Trait<'y>
55
| ^^^^^^^^^^^^^^
66
|
7-
note: hidden type `std::cell::Cell<&'x u32>` captures the lifetime 'x as defined on the function body at 17:7
7+
note: hidden type `std::cell::Cell<&'x u32>` captures the lifetime `'x` as defined on the function body at 17:7
88
--> $DIR/region-escape-via-bound.rs:17:7
99
|
1010
LL | where 'x: 'y

‎src/test/ui/impl-trait/static-return-lifetime-infered.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ LL | self.x.iter().map(|a| a.0)
3030
| |
3131
| ...but this borrow...
3232
|
33-
note: ...can't outlive the lifetime 'a as defined on the method body at 10:20
33+
note: ...can't outlive the lifetime `'a` as defined on the method body at 10:20
3434
--> $DIR/static-return-lifetime-infered.rs:10:20
3535
|
3636
LL | fn iter_values<'a>(&'a self) -> impl Iterator<Item=u32> {
3737
| ^^
38-
help: you can add a constraint to the return type to make it last less than `'static` and match the lifetime 'a as defined on the method body at 10:20
38+
help: you can add a constraint to the return type to make it last less than `'static` and match the lifetime `'a` as defined on the method body at 10:20
3939
|
4040
LL | fn iter_values<'a>(&'a self) -> impl Iterator<Item=u32> + 'a {
4141
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^

‎src/test/ui/in-band-lifetimes/mismatched_trait_impl.nll.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ LL | / fn foo(&self, x: &u32, y: &'a u32) -> &'a u32 {
1111
LL | | x
1212
LL | | }
1313
| |_____^
14-
note: ...but the lifetime must also be valid for the lifetime 'a as defined on the method body at 9:32...
14+
note: ...but the lifetime must also be valid for the lifetime `'a` as defined on the method body at 9:32...
1515
--> $DIR/mismatched_trait_impl.rs:9:32
1616
|
1717
LL | fn foo(&self, x: &u32, y: &'a u32) -> &'a u32 {

‎src/test/ui/in-band-lifetimes/mismatched_trait_impl.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ LL | / fn foo(&self, x: &u32, y: &'a u32) -> &'a u32 {
1111
LL | | x
1212
LL | | }
1313
| |_____^
14-
note: ...but the lifetime must also be valid for the lifetime 'a as defined on the method body at 9:32...
14+
note: ...but the lifetime must also be valid for the lifetime `'a` as defined on the method body at 9:32...
1515
--> $DIR/mismatched_trait_impl.rs:9:32
1616
|
1717
LL | fn foo(&self, x: &u32, y: &'a u32) -> &'a u32 {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ LL | drop::<Box<dyn for<'z> FnMut(&'z isize) -> &'z isize>>(Box::new(|z| {
1212
LL | | x
1313
LL | | }));
1414
| |_____^
15-
note: ...but the borrowed content is only valid for the lifetime 'x as defined on the function body at 1:9
15+
note: ...but the borrowed content is only valid for the lifetime `'x` as defined on the function body at 1:9
1616
--> $DIR/issue-10291.rs:1:9
1717
|
1818
LL | fn test<'x>(x: &'x isize) {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ note: ...so that reference does not outlive borrowed content
1616
|
1717
LL | self.a();
1818
| ^^^^
19-
note: but, the lifetime must be valid for the lifetime 'a as defined on the trait at 1:9...
19+
note: but, the lifetime must be valid for the lifetime `'a` as defined on the trait at 1:9...
2020
--> $DIR/issue-16683.rs:1:9
2121
|
2222
LL | trait T<'a> {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ LL | |
1717
LL | |
1818
LL | | }
1919
| |_____^
20-
note: ...does not necessarily outlive the lifetime 'a as defined on the impl at 5:7
20+
note: ...does not necessarily outlive the lifetime `'a` as defined on the impl at 5:7
2121
--> $DIR/issue-17740.rs:5:7
2222
|
2323
LL | impl <'a> Foo<'a>{
@@ -31,7 +31,7 @@ LL | fn bar(self: &mut Foo) {
3131
|
3232
= note: expected type `Foo<'a>`
3333
found type `Foo<'_>`
34-
note: the lifetime 'a as defined on the impl at 5:7...
34+
note: the lifetime `'a` as defined on the impl at 5:7...
3535
--> $DIR/issue-17740.rs:5:7
3636
|
3737
LL | impl <'a> Foo<'a>{

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ note: ...so that reference does not outlive borrowed content
1717
|
1818
LL | self.foo();
1919
| ^^^^
20-
note: but, the lifetime must be valid for the lifetime 'a as defined on the trait at 4:11...
20+
note: but, the lifetime must be valid for the lifetime `'a` as defined on the trait at 4:11...
2121
--> $DIR/issue-17758.rs:4:11
2222
|
2323
LL | trait Foo<'a> {

‎src/test/ui/issues/issue-17905-2.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ LL | |
1515
LL | | println!("{:?}", self);
1616
LL | | }
1717
| |_____^
18-
note: ...does not necessarily outlive the lifetime '_ as defined on the impl at 5:5
18+
note: ...does not necessarily outlive the lifetime `'_` as defined on the impl at 5:5
1919
--> $DIR/issue-17905-2.rs:5:5
2020
|
2121
LL | &str,
@@ -29,7 +29,7 @@ LL | fn say(self: &Pair<&str, isize>) {
2929
|
3030
= note: expected type `Pair<&str, _>`
3131
found type `Pair<&str, _>`
32-
note: the lifetime '_ as defined on the impl at 5:5...
32+
note: the lifetime `'_` as defined on the impl at 5:5...
3333
--> $DIR/issue-17905-2.rs:5:5
3434
|
3535
LL | &str,

0 commit comments

Comments
 (0)