Modify primary span on lifetime error

estebank · estebank · commit 4536f51287a9 · 2024-02-21T02:02:01.000Z
diff --git a/compiler/rustc_borrowck/src/diagnostics/region_errors.rs b/compiler/rustc_borrowck/src/diagnostics/region_errors.rs
@@ -742,6 +742,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
                 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",
@@ -762,6 +763,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",
diff --git a/compiler/rustc_borrowck/src/region_infer/mod.rs b/compiler/rustc_borrowck/src/region_infer/mod.rs
@@ -2057,7 +2057,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
                     None
                 }
             })
-            .unwrap_or_else(|| ObligationCauseCode::MiscObligation);
+            .unwrap_or(ObligationCauseCode::MiscObligation);
 
         // Classify each of the constraints along the path.
         let mut categorized_path: Vec<BlameConstraint<'tcx>> = path
diff --git a/tests/ui/lifetimes/static-impl-obligation.rs b/tests/ui/lifetimes/static-impl-obligation.rs
@@ -5,8 +5,8 @@ mod a {
         fn hello(&self) {}
     }
     fn bar<'a>(x: &'a &'a u32) {
-        let y: &dyn Foo = x; //~ ERROR lifetime may not live long enough
-        y.hello();
+        let y: &dyn Foo = x;
+        y.hello(); //~ ERROR lifetime may not live long enough
     }
 }
 mod b {
@@ -16,8 +16,8 @@ mod b {
         fn hello(&'static self) {}
     }
     fn bar<'a>(x: &'a &'a u32) {
-        let y: &dyn Foo = x; //~ ERROR lifetime may not live long enough
-        y.hello();
+        let y: &dyn Foo = x;
+        y.hello(); //~ ERROR lifetime may not live long enough
     }
 }
 mod c {
@@ -27,8 +27,8 @@ mod c {
         fn hello(&'static self) where Self: 'static {}
     }
     fn bar<'a>(x: &'a &'a u32) {
-        let y: &dyn Foo = x; //~ ERROR lifetime may not live long enough
-        y.hello();
+        let y: &dyn Foo = x;
+        y.hello(); //~ ERROR lifetime may not live long enough
     }
 }
 mod d {
@@ -38,8 +38,8 @@ mod d {
         fn hello(&self) where Self: 'static {}
     }
     fn bar<'a>(x: &'a &'a u32) {
-        let y: &dyn Foo = x; //~ ERROR lifetime may not live long enough
-        y.hello();
+        let y: &dyn Foo = x;
+        y.hello(); //~ ERROR lifetime may not live long enough
     }
 }
 mod e {
@@ -49,8 +49,8 @@ mod e {
         fn hello(&self) {}
     }
     fn bar<'a>(x: &'a &'a u32) {
-        let y: &dyn Foo = x; //~ ERROR lifetime may not live long enough
-        y.hello();
+        let y: &dyn Foo = x;
+        y.hello(); //~ ERROR lifetime may not live long enough
     }
 }
 mod f {
@@ -60,8 +60,8 @@ mod f {
         fn hello(&'static self) {}
     }
     fn bar<'a>(x: &'a &'a u32) {
-        let y: &dyn Foo = x; //~ ERROR lifetime may not live long enough
-        y.hello();
+        let y: &dyn Foo = x;
+        y.hello(); //~ ERROR lifetime may not live long enough
     }
 }
 mod g {
@@ -71,8 +71,8 @@ mod g {
         fn hello(&'static self) where Self: 'static {}
     }
     fn bar<'a>(x: &'a &'a u32) {
-        let y: &dyn Foo = x; //~ ERROR lifetime may not live long enough
-        y.hello();
+        let y: &dyn Foo = x;
+        y.hello(); //~ ERROR lifetime may not live long enough
     }
 }
 mod h {
@@ -82,8 +82,8 @@ mod h {
         fn hello(&self) where Self: 'static {}
     }
     fn bar<'a>(x: &'a &'a u32) {
-        let y: &dyn Foo = x; //~ ERROR lifetime may not live long enough
-        y.hello();
+        let y: &dyn Foo = x;
+        y.hello(); //~ ERROR lifetime may not live long enough
     }
 }
 mod i {
@@ -93,8 +93,8 @@ mod i {
         fn hello(&self) {}
     }
     fn bar<'a>(x: &'a &'a u32) {
-        let y: &dyn Foo = x; //~ ERROR lifetime may not live long enough
-        y.hello();
+        let y: &dyn Foo = x;
+        y.hello(); //~ ERROR lifetime may not live long enough
     }
 }
 mod j {
@@ -104,8 +104,8 @@ mod j {
         fn hello(&'static self) {}
     }
     fn bar<'a>(x: &'a &'a u32) {
-        let y: &dyn Foo = x; //~ ERROR lifetime may not live long enough
-        y.hello();
+        let y: &dyn Foo = x;
+        y.hello(); //~ ERROR lifetime may not live long enough
     }
 }
 mod k {
@@ -115,8 +115,8 @@ mod k {
         fn hello(&'static self) where Self: 'static {}
     }
     fn bar<'a>(x: &'a &'a u32) {
-        let y: &dyn Foo = x; //~ ERROR lifetime may not live long enough
-        y.hello();
+        let y: &dyn Foo = x;
+        y.hello(); //~ ERROR lifetime may not live long enough
     }
 }
 mod l {
@@ -126,8 +126,8 @@ mod l {
         fn hello(&self) where Self: 'static {}
     }
     fn bar<'a>(x: &'a &'a u32) {
-        let y: &dyn Foo = x; //~ ERROR lifetime may not live long enough
-        y.hello();
+        let y: &dyn Foo = x;
+        y.hello(); //~ ERROR lifetime may not live long enough
     }
 }
 mod m {
@@ -137,8 +137,8 @@ mod m {
         fn hello(&self) {}
     }
     fn bar<'a>(x: &'a &'a u32) {
-        let y: &dyn Foo = x; //~ ERROR lifetime may not live long enough
-        y.hello();
+        let y: &dyn Foo = x;
+        y.hello(); //~ ERROR lifetime may not live long enough
     }
 }
 mod n {
@@ -148,8 +148,8 @@ mod n {
         fn hello(&'static self) {}
     }
     fn bar<'a>(x: &'a &'a u32) {
-        let y: &dyn Foo = x; //~ ERROR lifetime may not live long enough
-        y.hello();
+        let y: &dyn Foo = x;
+        y.hello(); //~ ERROR lifetime may not live long enough
     }
 }
 mod o {
@@ -159,8 +159,8 @@ mod o {
         fn hello(&'static self) where Self: 'static {}
     }
     fn bar<'a>(x: &'a &'a u32) {
-        let y: &dyn Foo = x; //~ ERROR lifetime may not live long enough
-        y.hello();
+        let y: &dyn Foo = x;
+        y.hello(); //~ ERROR lifetime may not live long enough
     }
 }
 mod p {
@@ -170,8 +170,8 @@ mod p {
         fn hello(&self) where Self: 'static {}
     }
     fn bar<'a>(x: &'a &'a u32) {
-        let y: &dyn Foo = x; //~ ERROR lifetime may not live long enough
-        y.hello();
+        let y: &dyn Foo = x;
+        y.hello(); //~ ERROR lifetime may not live long enough
     }
 }
 mod q {
@@ -203,8 +203,8 @@ mod s {
 
     }
     fn convert<'a>(x: &'a &'a u32) {
-        let y: &dyn Foo = x; //~ ERROR lifetime may not live long enough
-        y.hello();
+        let y: &dyn Foo = x;
+        y.hello(); //~ ERROR lifetime may not live long enough
     }
 }
 fn main() {}
diff --git a/tests/ui/lifetimes/static-impl-obligation.stderr b/tests/ui/lifetimes/static-impl-obligation.stderr

Original file line number	Diff line number	Diff line change
`@@ -2057,7 +2057,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {`
`2057`	`2057`	`None`
`2058`	`2058`	`}`
`2059`	`2059`	`})`
`2060`		`- .unwrap_or_else(\|\| ObligationCauseCode::MiscObligation);`
	`2060`	`+ .unwrap_or(ObligationCauseCode::MiscObligation);`
`2061`	`2061`
`2062`	`2062`	`// Classify each of the constraints along the path.`
`2063`	`2063`	`let mut categorized_path: Vec<BlameConstraint<'tcx>> = path`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@ mod a {`
`5`	`5`	`fn hello(&self) {}`
`6`	`6`	`}`
`7`	`7`	`fn bar<'a>(x: &'a &'a u32) {`
`8`		`- let y: &dyn Foo = x; //~ ERROR lifetime may not live long enough`
`9`		`- y.hello();`
	`8`	`+ let y: &dyn Foo = x;`
	`9`	`+ y.hello(); //~ ERROR lifetime may not live long enough`
`10`	`10`	`}`
`11`	`11`	`}`
`12`	`12`	`mod b {`
`@@ -16,8 +16,8 @@ mod b {`
`16`	`16`	`fn hello(&'static self) {}`
`17`	`17`	`}`
`18`	`18`	`fn bar<'a>(x: &'a &'a u32) {`
`19`		`- let y: &dyn Foo = x; //~ ERROR lifetime may not live long enough`
`20`		`- y.hello();`
	`19`	`+ let y: &dyn Foo = x;`
	`20`	`+ y.hello(); //~ ERROR lifetime may not live long enough`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`	`mod c {`
`@@ -27,8 +27,8 @@ mod c {`
`27`	`27`	`fn hello(&'static self) where Self: 'static {}`
`28`	`28`	`}`
`29`	`29`	`fn bar<'a>(x: &'a &'a u32) {`
`30`		`- let y: &dyn Foo = x; //~ ERROR lifetime may not live long enough`
`31`		`- y.hello();`
	`30`	`+ let y: &dyn Foo = x;`
	`31`	`+ y.hello(); //~ ERROR lifetime may not live long enough`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`	`mod d {`
`@@ -38,8 +38,8 @@ mod d {`
`38`	`38`	`fn hello(&self) where Self: 'static {}`
`39`	`39`	`}`
`40`	`40`	`fn bar<'a>(x: &'a &'a u32) {`
`41`		`- let y: &dyn Foo = x; //~ ERROR lifetime may not live long enough`
`42`		`- y.hello();`
	`41`	`+ let y: &dyn Foo = x;`
	`42`	`+ y.hello(); //~ ERROR lifetime may not live long enough`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`	`mod e {`
`@@ -49,8 +49,8 @@ mod e {`
`49`	`49`	`fn hello(&self) {}`
`50`	`50`	`}`
`51`	`51`	`fn bar<'a>(x: &'a &'a u32) {`
`52`		`- let y: &dyn Foo = x; //~ ERROR lifetime may not live long enough`
`53`		`- y.hello();`
	`52`	`+ let y: &dyn Foo = x;`
	`53`	`+ y.hello(); //~ ERROR lifetime may not live long enough`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`	`mod f {`
`@@ -60,8 +60,8 @@ mod f {`
`60`	`60`	`fn hello(&'static self) {}`
`61`	`61`	`}`
`62`	`62`	`fn bar<'a>(x: &'a &'a u32) {`
`63`		`- let y: &dyn Foo = x; //~ ERROR lifetime may not live long enough`
`64`		`- y.hello();`
	`63`	`+ let y: &dyn Foo = x;`
	`64`	`+ y.hello(); //~ ERROR lifetime may not live long enough`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`	`mod g {`
`@@ -71,8 +71,8 @@ mod g {`
`71`	`71`	`fn hello(&'static self) where Self: 'static {}`
`72`	`72`	`}`
`73`	`73`	`fn bar<'a>(x: &'a &'a u32) {`
`74`		`- let y: &dyn Foo = x; //~ ERROR lifetime may not live long enough`
`75`		`- y.hello();`
	`74`	`+ let y: &dyn Foo = x;`
	`75`	`+ y.hello(); //~ ERROR lifetime may not live long enough`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`	`mod h {`
`@@ -82,8 +82,8 @@ mod h {`
`82`	`82`	`fn hello(&self) where Self: 'static {}`
`83`	`83`	`}`
`84`	`84`	`fn bar<'a>(x: &'a &'a u32) {`
`85`		`- let y: &dyn Foo = x; //~ ERROR lifetime may not live long enough`
`86`		`- y.hello();`
	`85`	`+ let y: &dyn Foo = x;`
	`86`	`+ y.hello(); //~ ERROR lifetime may not live long enough`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`	`mod i {`
`@@ -93,8 +93,8 @@ mod i {`
`93`	`93`	`fn hello(&self) {}`
`94`	`94`	`}`
`95`	`95`	`fn bar<'a>(x: &'a &'a u32) {`
`96`		`- let y: &dyn Foo = x; //~ ERROR lifetime may not live long enough`
`97`		`- y.hello();`
	`96`	`+ let y: &dyn Foo = x;`
	`97`	`+ y.hello(); //~ ERROR lifetime may not live long enough`
`98`	`98`	`}`
`99`	`99`	`}`
`100`	`100`	`mod j {`
`@@ -104,8 +104,8 @@ mod j {`
`104`	`104`	`fn hello(&'static self) {}`
`105`	`105`	`}`
`106`	`106`	`fn bar<'a>(x: &'a &'a u32) {`
`107`		`- let y: &dyn Foo = x; //~ ERROR lifetime may not live long enough`
`108`		`- y.hello();`
	`107`	`+ let y: &dyn Foo = x;`
	`108`	`+ y.hello(); //~ ERROR lifetime may not live long enough`
`109`	`109`	`}`
`110`	`110`	`}`
`111`	`111`	`mod k {`
`@@ -115,8 +115,8 @@ mod k {`
`115`	`115`	`fn hello(&'static self) where Self: 'static {}`
`116`	`116`	`}`
`117`	`117`	`fn bar<'a>(x: &'a &'a u32) {`
`118`		`- let y: &dyn Foo = x; //~ ERROR lifetime may not live long enough`
`119`		`- y.hello();`
	`118`	`+ let y: &dyn Foo = x;`
	`119`	`+ y.hello(); //~ ERROR lifetime may not live long enough`
`120`	`120`	`}`
`121`	`121`	`}`
`122`	`122`	`mod l {`
`@@ -126,8 +126,8 @@ mod l {`
`126`	`126`	`fn hello(&self) where Self: 'static {}`
`127`	`127`	`}`
`128`	`128`	`fn bar<'a>(x: &'a &'a u32) {`
`129`		`- let y: &dyn Foo = x; //~ ERROR lifetime may not live long enough`
`130`		`- y.hello();`
	`129`	`+ let y: &dyn Foo = x;`
	`130`	`+ y.hello(); //~ ERROR lifetime may not live long enough`
`131`	`131`	`}`
`132`	`132`	`}`
`133`	`133`	`mod m {`
`@@ -137,8 +137,8 @@ mod m {`
`137`	`137`	`fn hello(&self) {}`
`138`	`138`	`}`
`139`	`139`	`fn bar<'a>(x: &'a &'a u32) {`
`140`		`- let y: &dyn Foo = x; //~ ERROR lifetime may not live long enough`
`141`		`- y.hello();`
	`140`	`+ let y: &dyn Foo = x;`
	`141`	`+ y.hello(); //~ ERROR lifetime may not live long enough`
`142`	`142`	`}`
`143`	`143`	`}`
`144`	`144`	`mod n {`
`@@ -148,8 +148,8 @@ mod n {`
`148`	`148`	`fn hello(&'static self) {}`
`149`	`149`	`}`
`150`	`150`	`fn bar<'a>(x: &'a &'a u32) {`
`151`		`- let y: &dyn Foo = x; //~ ERROR lifetime may not live long enough`
`152`		`- y.hello();`
	`151`	`+ let y: &dyn Foo = x;`
	`152`	`+ y.hello(); //~ ERROR lifetime may not live long enough`
`153`	`153`	`}`
`154`	`154`	`}`
`155`	`155`	`mod o {`
`@@ -159,8 +159,8 @@ mod o {`
`159`	`159`	`fn hello(&'static self) where Self: 'static {}`
`160`	`160`	`}`
`161`	`161`	`fn bar<'a>(x: &'a &'a u32) {`
`162`		`- let y: &dyn Foo = x; //~ ERROR lifetime may not live long enough`
`163`		`- y.hello();`
	`162`	`+ let y: &dyn Foo = x;`
	`163`	`+ y.hello(); //~ ERROR lifetime may not live long enough`
`164`	`164`	`}`
`165`	`165`	`}`
`166`	`166`	`mod p {`
`@@ -170,8 +170,8 @@ mod p {`
`170`	`170`	`fn hello(&self) where Self: 'static {}`
`171`	`171`	`}`
`172`	`172`	`fn bar<'a>(x: &'a &'a u32) {`
`173`		`- let y: &dyn Foo = x; //~ ERROR lifetime may not live long enough`
`174`		`- y.hello();`
	`173`	`+ let y: &dyn Foo = x;`
	`174`	`+ y.hello(); //~ ERROR lifetime may not live long enough`
`175`	`175`	`}`
`176`	`176`	`}`
`177`	`177`	`mod q {`
`@@ -203,8 +203,8 @@ mod s {`
`203`	`203`
`204`	`204`	`}`
`205`	`205`	`fn convert<'a>(x: &'a &'a u32) {`
`206`		`- let y: &dyn Foo = x; //~ ERROR lifetime may not live long enough`
`207`		`- y.hello();`
	`206`	`+ let y: &dyn Foo = x;`
	`207`	`+ y.hello(); //~ ERROR lifetime may not live long enough`
`208`	`208`	`}`
`209`	`209`	`}`
`210`	`210`	`fn main() {}`