Tweak lifetime error

estebank · estebank · commit 258622a86203 · 2024-02-21T02:02:02.000Z
diff --git a/compiler/rustc_borrowck/src/diagnostics/region_errors.rs b/compiler/rustc_borrowck/src/diagnostics/region_errors.rs
@@ -708,6 +708,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
             }
         }
 
+        let mut new_primary_span = false;
         // When we have the HIR `Node` at hand, see if we can identify an
         // implicit `'static` bound in an `impl dyn Trait {}` and if that's
         // the only restriction, suggest relaxing it.
@@ -732,21 +733,15 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
                 }
                 hir::LifetimeName::Static if predicates.is_empty() => {
                     // `impl dyn Trait + 'static {}`
-                    Some((lt.ident.span, "consider replacing this `'static` requirement", "'_"))
+                    Some((lt.ident.span, "consider relaxing this `'static` requirement", "'_"))
                 }
                 _ => None,
             };
             if let Some((span, msg, sugg)) = suggestion {
                 // We only emit the suggestion to write `impl dyn Trait + '_ {}` if that's the only
                 // thing needed.
                 diag.span_suggestion_verbose(span, msg, sugg, Applicability::MachineApplicable);
-                // This is redundant but needed because we won't enter the section with the
-                // additional note, so we point at the method call here too.
-                diag.replace_span_with(*call_span, false);
-                diag.span_label(
-                    *call_span,
-                    "calling this method introduces a `'static` lifetime requirement",
-                );
+                new_primary_span = true;
             } else if let hir::LifetimeName::ImplicitObjectLifetimeDefault
             | hir::LifetimeName::Static = lt.res
             {
@@ -763,11 +758,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
             predicates.push(tcx.def_span(parent));
         }
         if !predicates.is_empty() {
-            diag.replace_span_with(*call_span, false);
-            diag.span_label(
-                *call_span,
-                "calling this method introduces a `'static` lifetime requirement",
-            );
+            new_primary_span = true;
             let a_static_lt = if predicates.len() == 1 {
                 "a `'static` lifetime requirement"
             } else {
@@ -776,6 +767,13 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
             let span: MultiSpan = predicates.into();
             diag.span_note(span, format!("the `impl` on `{ty}` has {a_static_lt}"));
         }
+        if new_primary_span && diag.span.primary_span() != Some(*call_span) {
+            diag.replace_span_with(*call_span, false);
+            diag.span_label(
+                *call_span,
+                "calling this method introduces a `'static` lifetime requirement",
+            );
+        }
     }
 
     /// Report a specialized error when `FnMut` closures return a reference to a captured variable.
diff --git a/tests/ui/lifetimes/static-impl-obligation.rs b/tests/ui/lifetimes/static-impl-obligation.rs
@@ -45,7 +45,7 @@ mod d {
 mod e {
     trait Foo {}
     impl<'a> Foo for &'a u32 {}
-    impl dyn Foo + 'static { //~ HELP consider replacing this `'static` requirement
+    impl dyn Foo + 'static { //~ HELP consider relaxing this `'static` requirement
         fn hello(&self) {}
     }
     fn bar<'a>(x: &'a &'a u32) {
diff --git a/tests/ui/lifetimes/static-impl-obligation.stderr b/tests/ui/lifetimes/static-impl-obligation.stderr
@@ -77,7 +77,7 @@ LL |         let y: &dyn Foo = x;
 LL |         y.hello();
    |         ^^^^^^^^^ calling this method introduces a `'static` lifetime requirement
    |
-help: consider replacing this `'static` requirement
+help: consider relaxing this `'static` requirement
    |
 LL |     impl dyn Foo + '_ {
    |                    ~~
@@ -288,7 +288,6 @@ LL |         x.hello();
    |         |
    |         `x` escapes the function body here
    |         argument requires that `'a` must outlive `'static`
-   |         calling this method introduces a `'static` lifetime requirement
    |
 note: the `impl` on `q::Foo` has a `'static` lifetime requirement
   --> $DIR/static-impl-obligation.rs:180:18
@@ -308,7 +307,6 @@ LL |         x.hello();
    |         |
    |         `x` escapes the function body here
    |         argument requires that `'a` must outlive `'static`
-   |         calling this method introduces a `'static` lifetime requirement
    |
 note: the `impl` on `r::Foo` has `'static` lifetime requirements
   --> $DIR/static-impl-obligation.rs:189:18
diff --git a/tests/ui/regions/issue-78262.base.stderr b/tests/ui/regions/issue-78262.base.stderr
@@ -6,7 +6,6 @@ LL |     let f = |x: &dyn TT| x.func();
    |              |  |        |
    |              |  |        `x` escapes the closure body here
    |              |  |        argument requires that `'1` must outlive `'static`
-   |              |  |        calling this method introduces a `'static` lifetime requirement
    |              |  let's call the lifetime of this reference `'1`
    |              `x` is a reference that is only valid in the closure body
    |
diff --git a/tests/ui/regions/issue-78262.polonius.stderr b/tests/ui/regions/issue-78262.polonius.stderr
@@ -6,7 +6,6 @@ LL |     let f = |x: &dyn TT| x.func();
    |              |  |        |
    |              |  |        `x` escapes the closure body here
    |              |  |        argument requires that `'1` must outlive `'static`
-   |              |  |        calling this method introduces a `'static` lifetime requirement
    |              |  let's call the lifetime of this reference `'1`
    |              `x` is a reference that is only valid in the closure body
    |
diff --git a/tests/ui/suggestions/impl-on-dyn-trait-with-implicit-static-bound.stderr b/tests/ui/suggestions/impl-on-dyn-trait-with-implicit-static-bound.stderr
@@ -10,7 +10,6 @@ LL |         val.use_self::<T>()
    |         |
    |         `val` escapes the function body here
    |         argument requires that `'a` must outlive `'static`
-   |         calling this method introduces a `'static` lifetime requirement
    |
 note: the used `impl` has a `'static` requirement
   --> $DIR/impl-on-dyn-trait-with-implicit-static-bound.rs:15:32
@@ -36,7 +35,6 @@ LL |         val.use_self()
    |         |
    |         `val` escapes the function body here
    |         argument requires that `'a` must outlive `'static`
-   |         calling this method introduces a `'static` lifetime requirement
    |
 note: the used `impl` has a `'static` requirement
   --> $DIR/impl-on-dyn-trait-with-implicit-static-bound.rs:67:14
@@ -106,7 +104,6 @@ LL |         val.use_self()
    |         |
    |         `val` escapes the function body here
    |         argument requires that `'a` must outlive `'static`
-   |         calling this method introduces a `'static` lifetime requirement
    |
 note: the used `impl` has a `'static` requirement
   --> $DIR/impl-on-dyn-trait-with-implicit-static-bound.rs:32:26

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ mod d {`
`45`	`45`	`mod e {`
`46`	`46`	`trait Foo {}`
`47`	`47`	`impl<'a> Foo for &'a u32 {}`
`48`		- impl dyn Foo + 'static { //~ HELP consider replacing this `'static` requirement
	`48`	+ impl dyn Foo + 'static { //~ HELP consider relaxing this `'static` requirement
`49`	`49`	`fn hello(&self) {}`
`50`	`50`	`}`
`51`	`51`	`fn bar<'a>(x: &'a &'a u32) {`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ LL \| let y: &dyn Foo = x;`
`77`	`77`	`LL \| y.hello();`
`78`	`78`	\| ^^^^^^^^^ calling this method introduces a `'static` lifetime requirement
`79`	`79`	`\|`
`80`		-help: consider replacing this `'static` requirement
	`80`	+help: consider relaxing this `'static` requirement
`81`	`81`	`\|`
`82`	`82`	`LL \| impl dyn Foo + '_ {`
`83`	`83`	`\| ~~`
`@@ -288,7 +288,6 @@ LL \| x.hello();`
`288`	`288`	`\| \|`
`289`	`289`	\| `x` escapes the function body here
`290`	`290`	\| argument requires that `'a` must outlive `'static`
`291`		- \| calling this method introduces a `'static` lifetime requirement
`292`	`291`	`\|`
`293`	`292`	note: the `impl` on `q::Foo` has a `'static` lifetime requirement
`294`	`293`	`--> $DIR/static-impl-obligation.rs:180:18`
`@@ -308,7 +307,6 @@ LL \| x.hello();`
`308`	`307`	`\| \|`
`309`	`308`	\| `x` escapes the function body here
`310`	`309`	\| argument requires that `'a` must outlive `'static`
`311`		- \| calling this method introduces a `'static` lifetime requirement
`312`	`310`	`\|`
`313`	`311`	note: the `impl` on `r::Foo` has `'static` lifetime requirements
`314`	`312`	`--> $DIR/static-impl-obligation.rs:189:18`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ LL \| let f = \|x: &dyn TT\| x.func();`
`6`	`6`	`\| \| \| \|`
`7`	`7`	\| \| \| `x` escapes the closure body here
`8`	`8`	\| \| \| argument requires that `'1` must outlive `'static`
`9`		- \| \| \| calling this method introduces a `'static` lifetime requirement
`10`	`9`	\| \| let's call the lifetime of this reference `'1`
`11`	`10`	\| `x` is a reference that is only valid in the closure body
`12`	`11`	`\|`