Tweak wording

estebank · estebank · commit ac2fb7a7f045 · 2020-04-17T10:46:22.000-07:00
diff --git a/src/librustc_resolve/late/diagnostics.rs b/src/librustc_resolve/late/diagnostics.rs
@@ -1035,6 +1035,8 @@ impl<'tcx> LifetimeContext<'_, 'tcx> {
         lifetime_names: &FxHashSet<ast::Ident>,
         params: &[ElisionFailureInfo],
     ) {
+        let snippet = self.tcx.sess.source_map().span_to_snippet(span).ok();
+
         err.span_label(
             span,
             &format!(
@@ -1044,11 +1046,10 @@ impl<'tcx> LifetimeContext<'_, 'tcx> {
             ),
         );
 
-        let snippet = self.tcx.sess.source_map().span_to_snippet(span).ok();
         let suggest_existing = |err: &mut DiagnosticBuilder<'_>, sugg| {
             err.span_suggestion_verbose(
                 span,
-                "consider using the named lifetime",
+                &format!("consider using the `{}` lifetime", lifetime_names.iter().next().unwrap()),
                 sugg,
                 Applicability::MaybeIncorrect,
             );
@@ -1138,6 +1139,20 @@ impl<'tcx> LifetimeContext<'_, 'tcx> {
             (0, _, Some(snippet)) if !snippet.ends_with('>') && count == 1 => {
                 suggest_new(err, &format!("{}<'a>", snippet));
             }
+            (n, ..) if n > 1 => {
+                let spans: Vec<Span> = lifetime_names.iter().map(|lt| lt.span).collect();
+                err.span_note(spans, "these named lifetimes are available to use");
+                if Some("") == snippet.as_deref() {
+                    // This happens when we have `Foo<T>` where we point at the space before `T`,
+                    // but this can be confusing so we give a suggestion with placeholders.
+                    err.span_suggestion_verbose(
+                        span,
+                        "consider using one of the available lifetimes here",
+                        "'lifetime, ".repeat(count),
+                        Applicability::HasPlaceholders,
+                    );
+                }
+            }
             _ => {}
         }
     }
diff --git a/src/test/ui/associated-types/bound-lifetime-in-binding-only.elision.stderr b/src/test/ui/associated-types/bound-lifetime-in-binding-only.elision.stderr
@@ -5,7 +5,7 @@ LL | fn elision<T: Fn() -> &i32>() {
    |                       ^ expected named lifetime parameter
    |
    = help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from
-help: consider using the named lifetime
+help: consider using the `'static` lifetime
    |
 LL | fn elision<T: Fn() -> &'static i32>() {
    |                       ^^^^^^^^
diff --git a/src/test/ui/associated-types/bound-lifetime-in-return-only.elision.stderr b/src/test/ui/associated-types/bound-lifetime-in-return-only.elision.stderr
@@ -5,7 +5,7 @@ LL | fn elision(_: fn() -> &i32) {
    |                       ^ expected named lifetime parameter
    |
    = help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from
-help: consider using the named lifetime
+help: consider using the `'static` lifetime
    |
 LL | fn elision(_: fn() -> &'static i32) {
    |                       ^^^^^^^^
diff --git a/src/test/ui/async-await/issues/issue-63388-2.stderr b/src/test/ui/async-await/issues/issue-63388-2.stderr
@@ -7,7 +7,7 @@ LL |     ) -> &dyn Foo
    |          ^ expected named lifetime parameter
    |
    = help: this function's return type contains a borrowed value, but the signature does not say whether it is borrowed from `foo` or `bar`
-help: consider using the named lifetime
+help: consider using the `'a` lifetime
    |
 LL |     ) -> &'a dyn Foo
    |          ^^^
diff --git a/src/test/ui/c-variadic/variadic-ffi-6.stderr b/src/test/ui/c-variadic/variadic-ffi-6.stderr
@@ -5,7 +5,7 @@ LL | ) -> &usize {
    |      ^ expected named lifetime parameter
    |
    = help: this function's return type contains a borrowed value with an elided lifetime, but the lifetime cannot be derived from the arguments
-help: consider using the named lifetime
+help: consider using the `'static` lifetime
    |
 LL | ) -> &'static usize {
    |      ^^^^^^^^
diff --git a/src/test/ui/foreign-fn-return-lifetime.stderr b/src/test/ui/foreign-fn-return-lifetime.stderr
@@ -5,7 +5,7 @@ LL |     pub fn f() -> &u8;
    |                   ^ expected named lifetime parameter
    |
    = help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from
-help: consider using the named lifetime
+help: consider using the `'static` lifetime
    |
 LL |     pub fn f() -> &'static u8;
    |                   ^^^^^^^^
diff --git a/src/test/ui/generics/issue-65285-incorrect-explicit-lifetime-name-needed.stderr b/src/test/ui/generics/issue-65285-incorrect-explicit-lifetime-name-needed.stderr
@@ -9,14 +9,26 @@ error[E0106]: missing lifetime specifier
    |
 LL |     fn foo<'b, L: X<&'b Nested<K>>>();
    |                     ^ expected named lifetime parameter
+   |
+note: these named lifetimes are available to use
+  --> $DIR/issue-65285-incorrect-explicit-lifetime-name-needed.rs:9:12
+   |
+LL | trait X<'a, K: 'a> {
+   |         ^^
+LL |     fn foo<'b, L: X<&'b Nested<K>>>();
+   |            ^^
+help: consider using one of the available lifetimes here
+   |
+LL |     fn foo<'b, L: X<'lifetime, &'b Nested<K>>>();
+   |                     ^^^^^^^^^^
 
 error[E0106]: missing lifetime specifier
   --> $DIR/issue-65285-incorrect-explicit-lifetime-name-needed.rs:13:17
    |
 LL | fn bar<'b, L: X<&'b Nested<i32>>>(){}
    |                 ^ expected named lifetime parameter
    |
-help: consider using the named lifetime
+help: consider using the `'b` lifetime
    |
 LL | fn bar<'b, L: X<'b, &'b Nested<i32>>>(){}
    |                 ^^^
diff --git a/src/test/ui/issues/issue-13497.stderr b/src/test/ui/issues/issue-13497.stderr
@@ -5,7 +5,7 @@ LL |     &str
    |     ^ expected named lifetime parameter
    |
    = help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from
-help: consider using the named lifetime
+help: consider using the `'static` lifetime
    |
 LL |     &'static str
    |     ^^^^^^^^
diff --git a/src/test/ui/issues/issue-26638.stderr b/src/test/ui/issues/issue-26638.stderr
@@ -17,7 +17,7 @@ LL | fn parse_type_2(iter: fn(&u8)->&u8) -> &str { iter() }
    |                                        ^ expected named lifetime parameter
    |
    = help: this function's return type contains a borrowed value with an elided lifetime, but the lifetime cannot be derived from the arguments
-help: consider using the named lifetime
+help: consider using the `'static` lifetime
    |
 LL | fn parse_type_2(iter: fn(&u8)->&u8) -> &'static str { iter() }
    |                                        ^^^^^^^^
@@ -29,7 +29,7 @@ LL | fn parse_type_3() -> &str { unimplemented!() }
    |                      ^ expected named lifetime parameter
    |
    = help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from
-help: consider using the named lifetime
+help: consider using the `'static` lifetime
    |
 LL | fn parse_type_3() -> &'static str { unimplemented!() }
    |                      ^^^^^^^^
diff --git a/src/test/ui/lifetimes/lifetime-elision-return-type-requires-explicit-lifetime.stderr b/src/test/ui/lifetimes/lifetime-elision-return-type-requires-explicit-lifetime.stderr
@@ -5,7 +5,7 @@ LL | fn f() -> &isize {
    |           ^ expected named lifetime parameter
    |
    = help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from
-help: consider using the named lifetime
+help: consider using the `'static` lifetime
    |
 LL | fn f() -> &'static isize {
    |           ^^^^^^^^
@@ -41,7 +41,7 @@ LL | fn i(_x: isize) -> &isize {
    |                    ^ expected named lifetime parameter
    |
    = help: this function's return type contains a borrowed value with an elided lifetime, but the lifetime cannot be derived from the arguments
-help: consider using the named lifetime
+help: consider using the `'static` lifetime
    |
 LL | fn i(_x: isize) -> &'static isize {
    |                    ^^^^^^^^
@@ -53,7 +53,7 @@ LL | fn j(_x: StaticStr) -> &isize {
    |                        ^ expected named lifetime parameter
    |
    = help: this function's return type contains a borrowed value with an elided lifetime, but the lifetime cannot be derived from the arguments
-help: consider using the named lifetime
+help: consider using the `'static` lifetime
    |
 LL | fn j(_x: StaticStr) -> &'static isize {
    |                        ^^^^^^^^
@@ -65,7 +65,7 @@ LL | fn k<'a, T: WithLifetime<'a>>(_x: T::Output) -> &isize {
    |                                                 ^ expected named lifetime parameter
    |
    = help: this function's return type contains a borrowed value with an elided lifetime, but the lifetime cannot be derived from the arguments
-help: consider using the named lifetime
+help: consider using the `'a` lifetime
    |
 LL | fn k<'a, T: WithLifetime<'a>>(_x: T::Output) -> &'a isize {
    |                                                 ^^^
diff --git a/src/test/ui/suggestions/missing-lifetime-specifier.stderr b/src/test/ui/suggestions/missing-lifetime-specifier.stderr
@@ -5,7 +5,7 @@ LL |     static a: RefCell<HashMap<i32, Vec<Vec<Foo>>>> = RefCell::new(HashMap::
    |                                            ^^^ expected 2 lifetime parameters
    |
    = help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from
-help: consider using the named lifetime
+help: consider using the `'static` lifetime
    |
 LL |     static a: RefCell<HashMap<i32, Vec<Vec<Foo<'static, 'static>>>>> = RefCell::new(HashMap::new());
    |                                            ^^^^^^^^^^^^^^^^^^^^^
@@ -17,7 +17,7 @@ LL |     static a: RefCell<HashMap<i32, Vec<Vec<Foo>>>> = RefCell::new(HashMap::
    |                                            ^^^ expected 2 lifetime parameters
    |
    = help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from
-help: consider using the named lifetime
+help: consider using the `'static` lifetime
    |
 LL |     static a: RefCell<HashMap<i32, Vec<Vec<Foo<'static, 'static>>>>> = RefCell::new(HashMap::new());
    |                                            ^^^^^^^^^^^^^^^^^^^^^
@@ -29,7 +29,7 @@ LL |     static b: RefCell<HashMap<i32, Vec<Vec<&Bar>>>> = RefCell::new(HashMap:
    |                                            ^ expected named lifetime parameter
    |
    = help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from
-help: consider using the named lifetime
+help: consider using the `'static` lifetime
    |
 LL |     static b: RefCell<HashMap<i32, Vec<Vec<&'static Bar>>>> = RefCell::new(HashMap::new());
    |                                            ^^^^^^^^
@@ -41,7 +41,7 @@ LL |     static b: RefCell<HashMap<i32, Vec<Vec<&Bar>>>> = RefCell::new(HashMap:
    |                                             ^^^ expected 2 lifetime parameters
    |
    = help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from
-help: consider using the named lifetime
+help: consider using the `'static` lifetime
    |
 LL |     static b: RefCell<HashMap<i32, Vec<Vec<&Bar<'static, 'static>>>>> = RefCell::new(HashMap::new());
    |                                             ^^^^^^^^^^^^^^^^^^^^^
@@ -53,7 +53,7 @@ LL |     static b: RefCell<HashMap<i32, Vec<Vec<&Bar>>>> = RefCell::new(HashMap:
    |                                            ^ expected named lifetime parameter
    |
    = help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from
-help: consider using the named lifetime
+help: consider using the `'static` lifetime
    |
 LL |     static b: RefCell<HashMap<i32, Vec<Vec<&'static Bar>>>> = RefCell::new(HashMap::new());
    |                                            ^^^^^^^^
@@ -65,7 +65,7 @@ LL |     static b: RefCell<HashMap<i32, Vec<Vec<&Bar>>>> = RefCell::new(HashMap:
    |                                             ^^^ expected 2 lifetime parameters
    |
    = help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from
-help: consider using the named lifetime
+help: consider using the `'static` lifetime
    |
 LL |     static b: RefCell<HashMap<i32, Vec<Vec<&Bar<'static, 'static>>>>> = RefCell::new(HashMap::new());
    |                                             ^^^^^^^^^^^^^^^^^^^^^
@@ -77,7 +77,7 @@ LL |     static c: RefCell<HashMap<i32, Vec<Vec<Qux<i32>>>>> = RefCell::new(Hash
    |                                                ^ expected 2 lifetime parameters
    |
    = help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from
-help: consider using the named lifetime
+help: consider using the `'static` lifetime
    |
 LL |     static c: RefCell<HashMap<i32, Vec<Vec<Qux<'static, 'static, i32>>>>> = RefCell::new(HashMap::new());
    |                                                ^^^^^^^^^^^^^^^^^
@@ -89,7 +89,7 @@ LL |     static c: RefCell<HashMap<i32, Vec<Vec<Qux<i32>>>>> = RefCell::new(Hash
    |                                                ^ expected 2 lifetime parameters
    |
    = help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from
-help: consider using the named lifetime
+help: consider using the `'static` lifetime
    |
 LL |     static c: RefCell<HashMap<i32, Vec<Vec<Qux<'static, 'static, i32>>>>> = RefCell::new(HashMap::new());
    |                                                ^^^^^^^^^^^^^^^^^
@@ -101,7 +101,7 @@ LL |     static d: RefCell<HashMap<i32, Vec<Vec<&Tar<i32>>>>> = RefCell::new(Has
    |                                            ^ expected named lifetime parameter
    |
    = help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from
-help: consider using the named lifetime
+help: consider using the `'static` lifetime
    |
 LL |     static d: RefCell<HashMap<i32, Vec<Vec<&'static Tar<i32>>>>> = RefCell::new(HashMap::new());
    |                                            ^^^^^^^^
@@ -113,7 +113,7 @@ LL |     static d: RefCell<HashMap<i32, Vec<Vec<&Tar<i32>>>>> = RefCell::new(Has
    |                                                 ^ expected 2 lifetime parameters
    |
    = help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from
-help: consider using the named lifetime
+help: consider using the `'static` lifetime
    |
 LL |     static d: RefCell<HashMap<i32, Vec<Vec<&Tar<'static, 'static, i32>>>>> = RefCell::new(HashMap::new());
    |                                                 ^^^^^^^^^^^^^^^^^
@@ -125,7 +125,7 @@ LL |     static d: RefCell<HashMap<i32, Vec<Vec<&Tar<i32>>>>> = RefCell::new(Has
    |                                            ^ expected named lifetime parameter
    |
    = help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from
-help: consider using the named lifetime
+help: consider using the `'static` lifetime
    |
 LL |     static d: RefCell<HashMap<i32, Vec<Vec<&'static Tar<i32>>>>> = RefCell::new(HashMap::new());
    |                                            ^^^^^^^^
@@ -137,7 +137,7 @@ LL |     static d: RefCell<HashMap<i32, Vec<Vec<&Tar<i32>>>>> = RefCell::new(Has
    |                                                 ^ expected 2 lifetime parameters
    |
    = help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from
-help: consider using the named lifetime
+help: consider using the `'static` lifetime
    |
 LL |     static d: RefCell<HashMap<i32, Vec<Vec<&Tar<'static, 'static, i32>>>>> = RefCell::new(HashMap::new());
    |                                                 ^^^^^^^^^^^^^^^^^
@@ -149,7 +149,7 @@ LL |     static f: RefCell<HashMap<i32, Vec<Vec<&Tar<'static, i32>>>>> = RefCell
    |                                            ^ expected named lifetime parameter
    |
    = help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from
-help: consider using the named lifetime
+help: consider using the `'static` lifetime
    |
 LL |     static f: RefCell<HashMap<i32, Vec<Vec<&'static Tar<'static, i32>>>>> = RefCell::new(HashMap::new());
    |                                            ^^^^^^^^
@@ -161,7 +161,7 @@ LL |     static f: RefCell<HashMap<i32, Vec<Vec<&Tar<'static, i32>>>>> = RefCell
    |                                            ^ expected named lifetime parameter
    |
    = help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from
-help: consider using the named lifetime
+help: consider using the `'static` lifetime
    |
 LL |     static f: RefCell<HashMap<i32, Vec<Vec<&'static Tar<'static, i32>>>>> = RefCell::new(HashMap::new());
    |                                            ^^^^^^^^
diff --git a/src/test/ui/suggestions/return-without-lifetime.stderr b/src/test/ui/suggestions/return-without-lifetime.stderr
@@ -4,7 +4,7 @@ error[E0106]: missing lifetime specifier
 LL | struct Foo<'a>(&usize);
    |                ^ expected named lifetime parameter
    |
-help: consider using the named lifetime
+help: consider using the `'a` lifetime
    |
 LL | struct Foo<'a>(&'a usize);
    |                ^^^
@@ -16,7 +16,7 @@ LL | fn func1<'a>(_arg: &'a Thing) -> &() { unimplemented!() }
    |                    ---------     ^ expected named lifetime parameter
    |
    = help: this function's return type contains a borrowed value, but the signature does not say which one of `_arg`'s 2 lifetimes it is borrowed from
-help: consider using the named lifetime
+help: consider using the `'a` lifetime
    |
 LL | fn func1<'a>(_arg: &'a Thing) -> &'a () { unimplemented!() }
    |                                  ^^^
@@ -28,7 +28,7 @@ LL | fn func2<'a>(_arg: &Thing<'a>) -> &() { unimplemented!() }
    |                    ----------     ^ expected named lifetime parameter
    |
    = help: this function's return type contains a borrowed value, but the signature does not say which one of `_arg`'s 2 lifetimes it is borrowed from
-help: consider using the named lifetime
+help: consider using the `'a` lifetime
    |
 LL | fn func2<'a>(_arg: &Thing<'a>) -> &'a () { unimplemented!() }
    |                                   ^^^
diff --git a/src/test/ui/underscore-lifetime/underscore-lifetime-binders.stderr b/src/test/ui/underscore-lifetime/underscore-lifetime-binders.stderr
@@ -16,7 +16,7 @@ error[E0106]: missing lifetime specifier
 LL | struct Baz<'a>(&'_ &'a u8);
    |                 ^^ expected named lifetime parameter
    |
-help: consider using the named lifetime
+help: consider using the `'a` lifetime
    |
 LL | struct Baz<'a>(&'a &'a u8);
    |                 ^^
@@ -28,7 +28,7 @@ LL | fn meh() -> Box<dyn for<'_> Meh<'_>>
    |                                 ^^ expected named lifetime parameter
    |
    = help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from
-help: consider using the named lifetime
+help: consider using the `'static` lifetime
    |
 LL | fn meh() -> Box<dyn for<'_> Meh<'static>>
    |                                 ^^^^^^^

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ LL \| fn elision<T: Fn() -> &i32>() {`
`5`	`5`	`\| ^ expected named lifetime parameter`
`6`	`6`	`\|`
`7`	`7`	`= help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from`
`8`		`-help: consider using the named lifetime`
	`8`	+help: consider using the `'static` lifetime
`9`	`9`	`\|`
`10`	`10`	`LL \| fn elision<T: Fn() -> &'static i32>() {`
`11`	`11`	`\| ^^^^^^^^`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ LL \| fn elision(_: fn() -> &i32) {`
`5`	`5`	`\| ^ expected named lifetime parameter`
`6`	`6`	`\|`
`7`	`7`	`= help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from`
`8`		`-help: consider using the named lifetime`
	`8`	+help: consider using the `'static` lifetime
`9`	`9`	`\|`
`10`	`10`	`LL \| fn elision(_: fn() -> &'static i32) {`
`11`	`11`	`\| ^^^^^^^^`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ LL \| ) -> &dyn Foo`
`7`	`7`	`\| ^ expected named lifetime parameter`
`8`	`8`	`\|`
`9`	`9`	= help: this function's return type contains a borrowed value, but the signature does not say whether it is borrowed from `foo` or `bar`
`10`		`-help: consider using the named lifetime`
	`10`	+help: consider using the `'a` lifetime
`11`	`11`	`\|`
`12`	`12`	`LL \| ) -> &'a dyn Foo`
`13`	`13`	`\| ^^^`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ LL \| ) -> &usize {`
`5`	`5`	`\| ^ expected named lifetime parameter`
`6`	`6`	`\|`
`7`	`7`	`= help: this function's return type contains a borrowed value with an elided lifetime, but the lifetime cannot be derived from the arguments`
`8`		`-help: consider using the named lifetime`
	`8`	+help: consider using the `'static` lifetime
`9`	`9`	`\|`
`10`	`10`	`LL \| ) -> &'static usize {`
`11`	`11`	`\| ^^^^^^^^`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ LL \| pub fn f() -> &u8;`
`5`	`5`	`\| ^ expected named lifetime parameter`
`6`	`6`	`\|`
`7`	`7`	`= help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from`
`8`		`-help: consider using the named lifetime`
	`8`	+help: consider using the `'static` lifetime
`9`	`9`	`\|`
`10`	`10`	`LL \| pub fn f() -> &'static u8;`
`11`	`11`	`\| ^^^^^^^^`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ LL \| &str`
`5`	`5`	`\| ^ expected named lifetime parameter`
`6`	`6`	`\|`
`7`	`7`	`= help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from`
`8`		`-help: consider using the named lifetime`
	`8`	+help: consider using the `'static` lifetime
`9`	`9`	`\|`
`10`	`10`	`LL \| &'static str`
`11`	`11`	`\| ^^^^^^^^`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ LL \| fn parse_type_2(iter: fn(&u8)->&u8) -> &str { iter() }`
`17`	`17`	`\| ^ expected named lifetime parameter`
`18`	`18`	`\|`
`19`	`19`	`= help: this function's return type contains a borrowed value with an elided lifetime, but the lifetime cannot be derived from the arguments`
`20`		`-help: consider using the named lifetime`
	`20`	+help: consider using the `'static` lifetime
`21`	`21`	`\|`
`22`	`22`	`LL \| fn parse_type_2(iter: fn(&u8)->&u8) -> &'static str { iter() }`
`23`	`23`	`\| ^^^^^^^^`
`@@ -29,7 +29,7 @@ LL \| fn parse_type_3() -> &str { unimplemented!() }`
`29`	`29`	`\| ^ expected named lifetime parameter`
`30`	`30`	`\|`
`31`	`31`	`= help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from`
`32`		`-help: consider using the named lifetime`
	`32`	+help: consider using the `'static` lifetime
`33`	`33`	`\|`
`34`	`34`	`LL \| fn parse_type_3() -> &'static str { unimplemented!() }`
`35`	`35`	`\| ^^^^^^^^`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ LL \| fn f() -> &isize {`
`5`	`5`	`\| ^ expected named lifetime parameter`
`6`	`6`	`\|`
`7`	`7`	`= help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from`
`8`		`-help: consider using the named lifetime`
	`8`	+help: consider using the `'static` lifetime
`9`	`9`	`\|`
`10`	`10`	`LL \| fn f() -> &'static isize {`
`11`	`11`	`\| ^^^^^^^^`
`@@ -41,7 +41,7 @@ LL \| fn i(_x: isize) -> &isize {`
`41`	`41`	`\| ^ expected named lifetime parameter`
`42`	`42`	`\|`
`43`	`43`	`= help: this function's return type contains a borrowed value with an elided lifetime, but the lifetime cannot be derived from the arguments`
`44`		`-help: consider using the named lifetime`
	`44`	+help: consider using the `'static` lifetime
`45`	`45`	`\|`
`46`	`46`	`LL \| fn i(_x: isize) -> &'static isize {`
`47`	`47`	`\| ^^^^^^^^`
`@@ -53,7 +53,7 @@ LL \| fn j(_x: StaticStr) -> &isize {`
`53`	`53`	`\| ^ expected named lifetime parameter`
`54`	`54`	`\|`
`55`	`55`	`= help: this function's return type contains a borrowed value with an elided lifetime, but the lifetime cannot be derived from the arguments`
`56`		`-help: consider using the named lifetime`
	`56`	+help: consider using the `'static` lifetime
`57`	`57`	`\|`
`58`	`58`	`LL \| fn j(_x: StaticStr) -> &'static isize {`
`59`	`59`	`\| ^^^^^^^^`
`@@ -65,7 +65,7 @@ LL \| fn k<'a, T: WithLifetime<'a>>(_x: T::Output) -> &isize {`
`65`	`65`	`\| ^ expected named lifetime parameter`
`66`	`66`	`\|`
`67`	`67`	`= help: this function's return type contains a borrowed value with an elided lifetime, but the lifetime cannot be derived from the arguments`
`68`		`-help: consider using the named lifetime`
	`68`	+help: consider using the `'a` lifetime
`69`	`69`	`\|`
`70`	`70`	`LL \| fn k<'a, T: WithLifetime<'a>>(_x: T::Output) -> &'a isize {`
`71`	`71`	`\| ^^^`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ LL \| static a: RefCell<HashMap<i32, Vec<Vec<Foo>>>> = RefCell::new(HashMap::`
`5`	`5`	`\| ^^^ expected 2 lifetime parameters`
`6`	`6`	`\|`
`7`	`7`	`= help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from`
`8`		`-help: consider using the named lifetime`
	`8`	+help: consider using the `'static` lifetime
`9`	`9`	`\|`
`10`	`10`	`LL \| static a: RefCell<HashMap<i32, Vec<Vec<Foo<'static, 'static>>>>> = RefCell::new(HashMap::new());`
`11`	`11`	`\| ^^^^^^^^^^^^^^^^^^^^^`
`@@ -17,7 +17,7 @@ LL \| static a: RefCell<HashMap<i32, Vec<Vec<Foo>>>> = RefCell::new(HashMap::`
`17`	`17`	`\| ^^^ expected 2 lifetime parameters`
`18`	`18`	`\|`
`19`	`19`	`= help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from`
`20`		`-help: consider using the named lifetime`
	`20`	+help: consider using the `'static` lifetime
`21`	`21`	`\|`
`22`	`22`	`LL \| static a: RefCell<HashMap<i32, Vec<Vec<Foo<'static, 'static>>>>> = RefCell::new(HashMap::new());`
`23`	`23`	`\| ^^^^^^^^^^^^^^^^^^^^^`
`@@ -29,7 +29,7 @@ LL \| static b: RefCell<HashMap<i32, Vec<Vec<&Bar>>>> = RefCell::new(HashMap:`
`29`	`29`	`\| ^ expected named lifetime parameter`
`30`	`30`	`\|`
`31`	`31`	`= help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from`
`32`		`-help: consider using the named lifetime`
	`32`	+help: consider using the `'static` lifetime
`33`	`33`	`\|`
`34`	`34`	`LL \| static b: RefCell<HashMap<i32, Vec<Vec<&'static Bar>>>> = RefCell::new(HashMap::new());`
`35`	`35`	`\| ^^^^^^^^`
`@@ -41,7 +41,7 @@ LL \| static b: RefCell<HashMap<i32, Vec<Vec<&Bar>>>> = RefCell::new(HashMap:`
`41`	`41`	`\| ^^^ expected 2 lifetime parameters`
`42`	`42`	`\|`
`43`	`43`	`= help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from`
`44`		`-help: consider using the named lifetime`
	`44`	+help: consider using the `'static` lifetime
`45`	`45`	`\|`
`46`	`46`	`LL \| static b: RefCell<HashMap<i32, Vec<Vec<&Bar<'static, 'static>>>>> = RefCell::new(HashMap::new());`
`47`	`47`	`\| ^^^^^^^^^^^^^^^^^^^^^`
`@@ -53,7 +53,7 @@ LL \| static b: RefCell<HashMap<i32, Vec<Vec<&Bar>>>> = RefCell::new(HashMap:`
`53`	`53`	`\| ^ expected named lifetime parameter`
`54`	`54`	`\|`
`55`	`55`	`= help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from`
`56`		`-help: consider using the named lifetime`
	`56`	+help: consider using the `'static` lifetime
`57`	`57`	`\|`
`58`	`58`	`LL \| static b: RefCell<HashMap<i32, Vec<Vec<&'static Bar>>>> = RefCell::new(HashMap::new());`
`59`	`59`	`\| ^^^^^^^^`
`@@ -65,7 +65,7 @@ LL \| static b: RefCell<HashMap<i32, Vec<Vec<&Bar>>>> = RefCell::new(HashMap:`
`65`	`65`	`\| ^^^ expected 2 lifetime parameters`
`66`	`66`	`\|`
`67`	`67`	`= help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from`
`68`		`-help: consider using the named lifetime`
	`68`	+help: consider using the `'static` lifetime
`69`	`69`	`\|`
`70`	`70`	`LL \| static b: RefCell<HashMap<i32, Vec<Vec<&Bar<'static, 'static>>>>> = RefCell::new(HashMap::new());`
`71`	`71`	`\| ^^^^^^^^^^^^^^^^^^^^^`
`@@ -77,7 +77,7 @@ LL \| static c: RefCell<HashMap<i32, Vec<Vec<Qux<i32>>>>> = RefCell::new(Hash`
`77`	`77`	`\| ^ expected 2 lifetime parameters`
`78`	`78`	`\|`
`79`	`79`	`= help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from`
`80`		`-help: consider using the named lifetime`
	`80`	+help: consider using the `'static` lifetime
`81`	`81`	`\|`
`82`	`82`	`LL \| static c: RefCell<HashMap<i32, Vec<Vec<Qux<'static, 'static, i32>>>>> = RefCell::new(HashMap::new());`
`83`	`83`	`\| ^^^^^^^^^^^^^^^^^`
`@@ -89,7 +89,7 @@ LL \| static c: RefCell<HashMap<i32, Vec<Vec<Qux<i32>>>>> = RefCell::new(Hash`
`89`	`89`	`\| ^ expected 2 lifetime parameters`
`90`	`90`	`\|`
`91`	`91`	`= help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from`
`92`		`-help: consider using the named lifetime`
	`92`	+help: consider using the `'static` lifetime
`93`	`93`	`\|`
`94`	`94`	`LL \| static c: RefCell<HashMap<i32, Vec<Vec<Qux<'static, 'static, i32>>>>> = RefCell::new(HashMap::new());`
`95`	`95`	`\| ^^^^^^^^^^^^^^^^^`
`@@ -101,7 +101,7 @@ LL \| static d: RefCell<HashMap<i32, Vec<Vec<&Tar<i32>>>>> = RefCell::new(Has`
`101`	`101`	`\| ^ expected named lifetime parameter`
`102`	`102`	`\|`
`103`	`103`	`= help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from`
`104`		`-help: consider using the named lifetime`
	`104`	+help: consider using the `'static` lifetime
`105`	`105`	`\|`
`106`	`106`	`LL \| static d: RefCell<HashMap<i32, Vec<Vec<&'static Tar<i32>>>>> = RefCell::new(HashMap::new());`
`107`	`107`	`\| ^^^^^^^^`
`@@ -113,7 +113,7 @@ LL \| static d: RefCell<HashMap<i32, Vec<Vec<&Tar<i32>>>>> = RefCell::new(Has`
`113`	`113`	`\| ^ expected 2 lifetime parameters`
`114`	`114`	`\|`
`115`	`115`	`= help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from`
`116`		`-help: consider using the named lifetime`
	`116`	+help: consider using the `'static` lifetime
`117`	`117`	`\|`
`118`	`118`	`LL \| static d: RefCell<HashMap<i32, Vec<Vec<&Tar<'static, 'static, i32>>>>> = RefCell::new(HashMap::new());`
`119`	`119`	`\| ^^^^^^^^^^^^^^^^^`
`@@ -125,7 +125,7 @@ LL \| static d: RefCell<HashMap<i32, Vec<Vec<&Tar<i32>>>>> = RefCell::new(Has`
`125`	`125`	`\| ^ expected named lifetime parameter`
`126`	`126`	`\|`
`127`	`127`	`= help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from`
`128`		`-help: consider using the named lifetime`
	`128`	+help: consider using the `'static` lifetime
`129`	`129`	`\|`
`130`	`130`	`LL \| static d: RefCell<HashMap<i32, Vec<Vec<&'static Tar<i32>>>>> = RefCell::new(HashMap::new());`
`131`	`131`	`\| ^^^^^^^^`
`@@ -137,7 +137,7 @@ LL \| static d: RefCell<HashMap<i32, Vec<Vec<&Tar<i32>>>>> = RefCell::new(Has`
`137`	`137`	`\| ^ expected 2 lifetime parameters`
`138`	`138`	`\|`
`139`	`139`	`= help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from`
`140`		`-help: consider using the named lifetime`
	`140`	+help: consider using the `'static` lifetime
`141`	`141`	`\|`
`142`	`142`	`LL \| static d: RefCell<HashMap<i32, Vec<Vec<&Tar<'static, 'static, i32>>>>> = RefCell::new(HashMap::new());`
`143`	`143`	`\| ^^^^^^^^^^^^^^^^^`
`@@ -149,7 +149,7 @@ LL \| static f: RefCell<HashMap<i32, Vec<Vec<&Tar<'static, i32>>>>> = RefCell`
`149`	`149`	`\| ^ expected named lifetime parameter`
`150`	`150`	`\|`
`151`	`151`	`= help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from`
`152`		`-help: consider using the named lifetime`
	`152`	+help: consider using the `'static` lifetime
`153`	`153`	`\|`
`154`	`154`	`LL \| static f: RefCell<HashMap<i32, Vec<Vec<&'static Tar<'static, i32>>>>> = RefCell::new(HashMap::new());`
`155`	`155`	`\| ^^^^^^^^`
`@@ -161,7 +161,7 @@ LL \| static f: RefCell<HashMap<i32, Vec<Vec<&Tar<'static, i32>>>>> = RefCell`
`161`	`161`	`\| ^ expected named lifetime parameter`
`162`	`162`	`\|`
`163`	`163`	`= help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from`
`164`		`-help: consider using the named lifetime`
	`164`	+help: consider using the `'static` lifetime
`165`	`165`	`\|`
`166`	`166`	`LL \| static f: RefCell<HashMap<i32, Vec<Vec<&'static Tar<'static, i32>>>>> = RefCell::new(HashMap::new());`
`167`	`167`	`\| ^^^^^^^^`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ error[E0106]: missing lifetime specifier`
`4`	`4`	`LL \| struct Foo<'a>(&usize);`
`5`	`5`	`\| ^ expected named lifetime parameter`
`6`	`6`	`\|`
`7`		`-help: consider using the named lifetime`
	`7`	+help: consider using the `'a` lifetime
`8`	`8`	`\|`
`9`	`9`	`LL \| struct Foo<'a>(&'a usize);`
`10`	`10`	`\| ^^^`
`@@ -16,7 +16,7 @@ LL \| fn func1<'a>(_arg: &'a Thing) -> &() { unimplemented!() }`
`16`	`16`	`\| --------- ^ expected named lifetime parameter`
`17`	`17`	`\|`
`18`	`18`	= help: this function's return type contains a borrowed value, but the signature does not say which one of `_arg`'s 2 lifetimes it is borrowed from
`19`		`-help: consider using the named lifetime`
	`19`	+help: consider using the `'a` lifetime
`20`	`20`	`\|`
`21`	`21`	`LL \| fn func1<'a>(_arg: &'a Thing) -> &'a () { unimplemented!() }`
`22`	`22`	`\| ^^^`
`@@ -28,7 +28,7 @@ LL \| fn func2<'a>(_arg: &Thing<'a>) -> &() { unimplemented!() }`
`28`	`28`	`\| ---------- ^ expected named lifetime parameter`
`29`	`29`	`\|`
`30`	`30`	= help: this function's return type contains a borrowed value, but the signature does not say which one of `_arg`'s 2 lifetimes it is borrowed from
`31`		`-help: consider using the named lifetime`
	`31`	+help: consider using the `'a` lifetime
`32`	`32`	`\|`
`33`	`33`	`LL \| fn func2<'a>(_arg: &Thing<'a>) -> &'a () { unimplemented!() }`
`34`	`34`	`\| ^^^`