small tweaks

estebank · estebank · commit 187e1050a2d0 · 2020-06-09T13:58:56.000-07:00
diff --git a/src/librustc_infer/infer/error_reporting/nice_region_error/static_impl_trait.rs b/src/librustc_infer/infer/error_reporting/nice_region_error/static_impl_trait.rs
@@ -79,15 +79,22 @@ impl<'a, 'tcx> NiceRegionError<'a, 'tcx> {
                             );
                         } else {
                             err.span_label(sup_origin.span(), "...is captured here...");
-                            err.span_note(
-                                return_sp,
-                                "...and is required to live as long as `'static` here",
-                            );
+                            if return_sp < sup_origin.span() {
+                                err.span_note(
+                                    return_sp,
+                                    "...and is required to live as long as `'static` here",
+                                );
+                            } else {
+                                err.span_label(
+                                    return_sp,
+                                    "...and is required to live as long as `'static` here",
+                                );
+                            }
                         }
                     } else {
                         err.span_label(
                             return_sp,
-                            "...is captured and required live as long as `'static` here",
+                            "...is captured and required to live as long as `'static` here",
                         );
                     }
 
@@ -104,7 +111,8 @@ impl<'a, 'tcx> NiceRegionError<'a, 'tcx> {
                         };
                         let explicit =
                             format!("you can add an explicit `{}` lifetime bound", lifetime_name);
-                        let explicit_static = format!("explicit `'static` bound to {}", arg);
+                        let explicit_static =
+                            format!("explicit `'static` bound to the lifetime of {}", arg);
                         let captures = format!("captures data from {}", arg);
                         let add_static_bound =
                             "alternatively, add an explicit `'static` bound to this reference";
diff --git a/src/test/ui/async-await/issues/issue-62097.stderr b/src/test/ui/async-await/issues/issue-62097.stderr
@@ -6,12 +6,8 @@ LL |     pub async fn run_dummy_fn(&self) {
    |                               |
    |                               this data with an anonymous lifetime `'_`...
    |                               ...is captured here...
-   |
-note: ...and is required to live as long as `'static` here
-  --> $DIR/issue-62097.rs:13:9
-   |
 LL |         foo(|| self.bar()).await;
-   |         ^^^
+   |         --- ...and is required to live as long as `'static` here
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/impl-trait/must_outlive_least_region_or_bound.stderr b/src/test/ui/impl-trait/must_outlive_least_region_or_bound.stderr
@@ -47,7 +47,7 @@ note: ...and is required to live as long as `'static` here
    |
 LL | fn elided2(x: &i32) -> impl Copy + 'static { x }
    |                        ^^^^^^^^^^^^^^^^^^^
-help: consider changing the `impl Trait`'s explicit `'static` bound to argument `x`
+help: consider changing the `impl Trait`'s explicit `'static` bound to the lifetime of argument `x`
    |
 LL | fn elided2(x: &i32) -> impl Copy + '_ { x }
    |                                    ^^
@@ -69,7 +69,7 @@ note: ...and is required to live as long as `'static` here
    |
 LL | fn explicit2<'a>(x: &'a i32) -> impl Copy + 'static { x }
    |                                 ^^^^^^^^^^^^^^^^^^^
-help: consider changing the `impl Trait`'s explicit `'static` bound to argument `x`
+help: consider changing the `impl Trait`'s explicit `'static` bound to the lifetime of argument `x`
    |
 LL | fn explicit2<'a>(x: &'a i32) -> impl Copy + 'a { x }
    |                                             ^^
@@ -97,7 +97,7 @@ note: ...and is required to live as long as `'static` here
    |
 LL | fn with_bound<'a>(x: &'a i32) -> impl LifetimeTrait<'a> + 'static { x }
    |                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-help: consider changing the `impl Trait`'s explicit `'static` bound to argument `x`
+help: consider changing the `impl Trait`'s explicit `'static` bound to the lifetime of argument `x`
    |
 LL | fn with_bound<'a>(x: &'a i32) -> impl LifetimeTrait<'a> + 'a { x }
    |                                                           ^^
@@ -157,7 +157,7 @@ LL | fn elided4(x: &i32) -> Box<dyn Debug + 'static> { Box::new(x) }
    |               |
    |               this data with an anonymous lifetime `'_`...
    |
-help: consider changing the trait object's explicit `'static` bound to argument `x`
+help: consider changing the trait object's explicit `'static` bound to the lifetime of argument `x`
    |
 LL | fn elided4(x: &i32) -> Box<dyn Debug + '_> { Box::new(x) }
    |                                        ^^
@@ -172,7 +172,7 @@ error[E0758]: cannot infer an appropriate lifetime
 LL | fn explicit4<'a>(x: &'a i32) -> Box<dyn Debug + 'static> { Box::new(x) }
    |                     ------- this data with lifetime `'a`...         ^ ...is captured here, requiring it to live as long as `'static`
    |
-help: consider changing the trait object's explicit `'static` bound to argument `x`
+help: consider changing the trait object's explicit `'static` bound to the lifetime of argument `x`
    |
 LL | fn explicit4<'a>(x: &'a i32) -> Box<dyn Debug + 'a> { Box::new(x) }
    |                                                 ^^
diff --git a/src/test/ui/object-lifetime/object-lifetime-default-from-box-error.stderr b/src/test/ui/object-lifetime/object-lifetime-default-from-box-error.stderr
@@ -5,7 +5,7 @@ LL | fn load(ss: &mut SomeStruct) -> Box<dyn SomeTrait> {
    |             --------------- this data with an anonymous lifetime `'_`...
 ...
 LL |     ss.r
-   |     ^^^^ ...is captured and required live as long as `'static` here
+   |     ^^^^ ...is captured and required to live as long as `'static` here
    |
 help: to declare that the trait object captures data from argument `ss`, you can add an explicit `'_` lifetime bound
    |
diff --git a/src/test/ui/regions/region-object-lifetime-in-coercion.stderr b/src/test/ui/regions/region-object-lifetime-in-coercion.stderr
@@ -6,7 +6,7 @@ LL | fn a(v: &[u8]) -> Box<dyn Foo + 'static> {
 LL |     let x: Box<dyn Foo + 'static> = Box::new(v);
    |                                              ^ ...is captured here, requiring it to live as long as `'static`
    |
-help: consider changing the trait object's explicit `'static` bound to argument `v`
+help: consider changing the trait object's explicit `'static` bound to the lifetime of argument `v`
    |
 LL | fn a(v: &[u8]) -> Box<dyn Foo + '_> {
    |                                 ^^
@@ -23,7 +23,7 @@ LL | fn b(v: &[u8]) -> Box<dyn Foo + 'static> {
 LL |     Box::new(v)
    |              ^ ...is captured here, requiring it to live as long as `'static`
    |
-help: consider changing the trait object's explicit `'static` bound to argument `v`
+help: consider changing the trait object's explicit `'static` bound to the lifetime of argument `v`
    |
 LL | fn b(v: &[u8]) -> Box<dyn Foo + '_> {
    |                                 ^^
diff --git a/src/test/ui/regions/regions-close-object-into-object-2.stderr b/src/test/ui/regions/regions-close-object-into-object-2.stderr
@@ -6,7 +6,7 @@ LL | fn g<'a, T: 'static>(v: Box<dyn A<T> + 'a>) -> Box<dyn X + 'static> {
 LL |     box B(&*v) as Box<dyn X>
    |           ^^^ ...is captured here, requiring it to live as long as `'static`
    |
-help: consider changing the trait object's explicit `'static` bound to argument `v`
+help: consider changing the trait object's explicit `'static` bound to the lifetime of argument `v`
    |
 LL | fn g<'a, T: 'static>(v: Box<dyn A<T> + 'a>) -> Box<dyn X + 'a> {
    |                                                            ^^
diff --git a/src/test/ui/regions/regions-close-object-into-object-4.stderr b/src/test/ui/regions/regions-close-object-into-object-4.stderr
@@ -6,7 +6,7 @@ LL | fn i<'a, T, U>(v: Box<dyn A<U>+'a>) -> Box<dyn X + 'static> {
 LL |     box B(&*v) as Box<dyn X>
    |           ^^^ ...is captured here, requiring it to live as long as `'static`
    |
-help: consider changing the trait object's explicit `'static` bound to argument `v`
+help: consider changing the trait object's explicit `'static` bound to the lifetime of argument `v`
    |
 LL | fn i<'a, T, U>(v: Box<dyn A<U>+'a>) -> Box<dyn X + 'a> {
    |                                                    ^^
diff --git a/src/test/ui/regions/regions-proc-bound-capture.stderr b/src/test/ui/regions/regions-proc-bound-capture.stderr
@@ -7,7 +7,7 @@ LL |     // This is illegal, because the region bound on `proc` is 'static.
 LL |     Box::new(move || { *x })
    |              ^^^^^^^^^^^^^^ ...is captured here, requiring it to live as long as `'static`
    |
-help: consider changing the trait object's explicit `'static` bound to argument `x`
+help: consider changing the trait object's explicit `'static` bound to the lifetime of argument `x`
    |
 LL | fn static_proc(x: &isize) -> Box<dyn FnMut() -> (isize) + '_> {
    |                                                           ^^
diff --git a/src/test/ui/self/arbitrary_self_types_pin_lifetime_impl_trait-async.stderr b/src/test/ui/self/arbitrary_self_types_pin_lifetime_impl_trait-async.stderr
@@ -2,15 +2,10 @@ error[E0758]: cannot infer an appropriate lifetime
   --> $DIR/arbitrary_self_types_pin_lifetime_impl_trait-async.rs:8:16
    |
 LL |     async fn f(self: Pin<&Self>) -> impl Clone { self }
-   |                ^^^^  ---------- this data with an anonymous lifetime `'_`...
-   |                |
+   |                ^^^^  ----------     ---------- ...and is required to live as long as `'static` here
+   |                |     |
+   |                |     this data with an anonymous lifetime `'_`...
    |                ...is captured here...
-   |
-note: ...and is required to live as long as `'static` here
-  --> $DIR/arbitrary_self_types_pin_lifetime_impl_trait-async.rs:8:37
-   |
-LL |     async fn f(self: Pin<&Self>) -> impl Clone { self }
-   |                                     ^^^^^^^^^^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/underscore-lifetime/dyn-trait-underscore.stderr b/src/test/ui/underscore-lifetime/dyn-trait-underscore.stderr
@@ -5,7 +5,7 @@ LL | fn a<T>(items: &[T]) -> Box<dyn Iterator<Item=&T>> {
    |                ---- this data with an anonymous lifetime `'_`...
 LL |     //                      ^^^^^^^^^^^^^^^^^^^^^ bound *here* defaults to `'static`
 LL |     Box::new(items.iter())
-   |     ---------------^^^^--- ...is captured and required live as long as `'static` here
+   |     ---------------^^^^--- ...is captured and required to live as long as `'static` here
    |
 help: to declare that the trait object captures data from argument `items`, you can add an explicit `'_` lifetime bound
    |

Original file line number	Diff line number	Diff line change
@@ -47,7 +47,7 @@ note: ...and is required to live as long as `'static` here
`47`	`47`	`\|`
`48`	`48`	`LL \| fn elided2(x: &i32) -> impl Copy + 'static { x }`
`49`	`49`	`\| ^^^^^^^^^^^^^^^^^^^`
`50`		-help: consider changing the `impl Trait`'s explicit `'static` bound to argument `x`
	`50`	+help: consider changing the `impl Trait`'s explicit `'static` bound to the lifetime of argument `x`
`51`	`51`	`\|`
`52`	`52`	`LL \| fn elided2(x: &i32) -> impl Copy + '_ { x }`
`53`	`53`	`\| ^^`
@@ -69,7 +69,7 @@ note: ...and is required to live as long as `'static` here
`69`	`69`	`\|`
`70`	`70`	`LL \| fn explicit2<'a>(x: &'a i32) -> impl Copy + 'static { x }`
`71`	`71`	`\| ^^^^^^^^^^^^^^^^^^^`
`72`		-help: consider changing the `impl Trait`'s explicit `'static` bound to argument `x`
	`72`	+help: consider changing the `impl Trait`'s explicit `'static` bound to the lifetime of argument `x`
`73`	`73`	`\|`
`74`	`74`	`LL \| fn explicit2<'a>(x: &'a i32) -> impl Copy + 'a { x }`
`75`	`75`	`\| ^^`
@@ -97,7 +97,7 @@ note: ...and is required to live as long as `'static` here
`97`	`97`	`\|`
`98`	`98`	`LL \| fn with_bound<'a>(x: &'a i32) -> impl LifetimeTrait<'a> + 'static { x }`
`99`	`99`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`100`		-help: consider changing the `impl Trait`'s explicit `'static` bound to argument `x`
	`100`	+help: consider changing the `impl Trait`'s explicit `'static` bound to the lifetime of argument `x`
`101`	`101`	`\|`
`102`	`102`	`LL \| fn with_bound<'a>(x: &'a i32) -> impl LifetimeTrait<'a> + 'a { x }`
`103`	`103`	`\| ^^`
`@@ -157,7 +157,7 @@ LL \| fn elided4(x: &i32) -> Box<dyn Debug + 'static> { Box::new(x) }`
`157`	`157`	`\| \|`
`158`	`158`	\| this data with an anonymous lifetime `'_`...
`159`	`159`	`\|`
`160`		-help: consider changing the trait object's explicit `'static` bound to argument `x`
	`160`	+help: consider changing the trait object's explicit `'static` bound to the lifetime of argument `x`
`161`	`161`	`\|`
`162`	`162`	`LL \| fn elided4(x: &i32) -> Box<dyn Debug + '_> { Box::new(x) }`
`163`	`163`	`\| ^^`
`@@ -172,7 +172,7 @@ error[E0758]: cannot infer an appropriate lifetime`
`172`	`172`	`LL \| fn explicit4<'a>(x: &'a i32) -> Box<dyn Debug + 'static> { Box::new(x) }`
`173`	`173`	\| ------- this data with lifetime `'a`... ^ ...is captured here, requiring it to live as long as `'static`
`174`	`174`	`\|`
`175`		-help: consider changing the trait object's explicit `'static` bound to argument `x`
	`175`	+help: consider changing the trait object's explicit `'static` bound to the lifetime of argument `x`
`176`	`176`	`\|`
`177`	`177`	`LL \| fn explicit4<'a>(x: &'a i32) -> Box<dyn Debug + 'a> { Box::new(x) }`
`178`	`178`	`\| ^^`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ LL \| fn load(ss: &mut SomeStruct) -> Box<dyn SomeTrait> {`
`5`	`5`	\| --------------- this data with an anonymous lifetime `'_`...
`6`	`6`	`...`
`7`	`7`	`LL \| ss.r`
`8`		- \| ^^^^ ...is captured and required live as long as `'static` here
	`8`	+ \| ^^^^ ...is captured and required to live as long as `'static` here
`9`	`9`	`\|`
`10`	`10`	help: to declare that the trait object captures data from argument `ss`, you can add an explicit `'_` lifetime bound
`11`	`11`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ LL \| fn a(v: &[u8]) -> Box<dyn Foo + 'static> {`
`6`	`6`	`LL \| let x: Box<dyn Foo + 'static> = Box::new(v);`
`7`	`7`	\| ^ ...is captured here, requiring it to live as long as `'static`
`8`	`8`	`\|`
`9`		-help: consider changing the trait object's explicit `'static` bound to argument `v`
	`9`	+help: consider changing the trait object's explicit `'static` bound to the lifetime of argument `v`
`10`	`10`	`\|`
`11`	`11`	`LL \| fn a(v: &[u8]) -> Box<dyn Foo + '_> {`
`12`	`12`	`\| ^^`
`@@ -23,7 +23,7 @@ LL \| fn b(v: &[u8]) -> Box<dyn Foo + 'static> {`
`23`	`23`	`LL \| Box::new(v)`
`24`	`24`	\| ^ ...is captured here, requiring it to live as long as `'static`
`25`	`25`	`\|`
`26`		-help: consider changing the trait object's explicit `'static` bound to argument `v`
	`26`	+help: consider changing the trait object's explicit `'static` bound to the lifetime of argument `v`
`27`	`27`	`\|`
`28`	`28`	`LL \| fn b(v: &[u8]) -> Box<dyn Foo + '_> {`
`29`	`29`	`\| ^^`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ LL \| fn g<'a, T: 'static>(v: Box<dyn A<T> + 'a>) -> Box<dyn X + 'static> {`
`6`	`6`	`LL \| box B(&*v) as Box<dyn X>`
`7`	`7`	\| ^^^ ...is captured here, requiring it to live as long as `'static`
`8`	`8`	`\|`
`9`		-help: consider changing the trait object's explicit `'static` bound to argument `v`
	`9`	+help: consider changing the trait object's explicit `'static` bound to the lifetime of argument `v`
`10`	`10`	`\|`
`11`	`11`	`LL \| fn g<'a, T: 'static>(v: Box<dyn A<T> + 'a>) -> Box<dyn X + 'a> {`
`12`	`12`	`\| ^^`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ LL \| fn i<'a, T, U>(v: Box<dyn A<U>+'a>) -> Box<dyn X + 'static> {`
`6`	`6`	`LL \| box B(&*v) as Box<dyn X>`
`7`	`7`	\| ^^^ ...is captured here, requiring it to live as long as `'static`
`8`	`8`	`\|`
`9`		-help: consider changing the trait object's explicit `'static` bound to argument `v`
	`9`	+help: consider changing the trait object's explicit `'static` bound to the lifetime of argument `v`
`10`	`10`	`\|`
`11`	`11`	`LL \| fn i<'a, T, U>(v: Box<dyn A<U>+'a>) -> Box<dyn X + 'a> {`
`12`	`12`	`\| ^^`
Original file line number	Diff line number	Diff line change
@@ -7,7 +7,7 @@ LL \| // This is illegal, because the region bound on `proc` is 'static.
`7`	`7`	`LL \| Box::new(move \|\| { *x })`
`8`	`8`	\| ^^^^^^^^^^^^^^ ...is captured here, requiring it to live as long as `'static`
`9`	`9`	`\|`
`10`		-help: consider changing the trait object's explicit `'static` bound to argument `x`
	`10`	+help: consider changing the trait object's explicit `'static` bound to the lifetime of argument `x`
`11`	`11`	`\|`
`12`	`12`	`LL \| fn static_proc(x: &isize) -> Box<dyn FnMut() -> (isize) + '_> {`
`13`	`13`	`\| ^^`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ LL \| fn a<T>(items: &[T]) -> Box<dyn Iterator<Item=&T>> {`
`5`	`5`	\| ---- this data with an anonymous lifetime `'_`...
`6`	`6`	LL \| // ^^^^^^^^^^^^^^^^^^^^^ bound here defaults to `'static`
`7`	`7`	`LL \| Box::new(items.iter())`
`8`		- \| ---------------^^^^--- ...is captured and required live as long as `'static` here
	`8`	+ \| ---------------^^^^--- ...is captured and required to live as long as `'static` here
`9`	`9`	`\|`
`10`	`10`	help: to declare that the trait object captures data from argument `items`, you can add an explicit `'_` lifetime bound
`11`	`11`	`\|`