Update error message position

Aaron1011 · Aaron1011 · commit 17d6d11ee772 · 2019-12-12T12:40:12.000-05:00
diff --git a/src/librustc/traits/error_reporting.rs b/src/librustc/traits/error_reporting.rs
@@ -2408,7 +2408,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
                 ("`Sync`", "shared")
             };
 
-            err.note(
+            err.set_primary_message(
                 &format!("future cannot be {} between threads safely", trait_verb)
             );
 
diff --git a/src/test/ui/async-await/async-fn-nonsend.stderr b/src/test/ui/async-await/async-fn-nonsend.stderr
@@ -1,4 +1,4 @@
-error[E0277]: `std::rc::Rc<()>` cannot be sent between threads safely
+error[E0277]: future cannot be sent between threads safely
   --> $DIR/async-fn-nonsend.rs:50:5
    |
 LL | fn assert_send(_: impl Send) {}
@@ -8,7 +8,6 @@ LL |     assert_send(local_dropped_before_await());
    |     ^^^^^^^^^^^ future returned by `local_dropped_before_await` is not `Send`
    |
    = help: within `impl std::future::Future`, the trait `std::marker::Send` is not implemented for `std::rc::Rc<()>`
-   = note: future cannot be sent between threads safely
 note: future is not `Send` as this value is used across an await
   --> $DIR/async-fn-nonsend.rs:25:5
    |
@@ -20,7 +19,7 @@ LL |     fut().await;
 LL | }
    | - `x` is later dropped here
 
-error[E0277]: `std::rc::Rc<()>` cannot be sent between threads safely
+error[E0277]: future cannot be sent between threads safely
   --> $DIR/async-fn-nonsend.rs:52:5
    |
 LL | fn assert_send(_: impl Send) {}
@@ -30,7 +29,6 @@ LL |     assert_send(non_send_temporary_in_match());
    |     ^^^^^^^^^^^ future returned by `non_send_temporary_in_match` is not `Send`
    |
    = help: within `impl std::future::Future`, the trait `std::marker::Send` is not implemented for `std::rc::Rc<()>`
-   = note: future cannot be sent between threads safely
 note: future is not `Send` as this value is used across an await
   --> $DIR/async-fn-nonsend.rs:34:20
    |
@@ -42,7 +40,7 @@ LL |         Some(_) => fut().await,
 LL | }
    | - `non_send()` is later dropped here
 
-error[E0277]: `dyn std::fmt::Write` cannot be sent between threads safely
+error[E0277]: future cannot be sent between threads safely
   --> $DIR/async-fn-nonsend.rs:54:5
    |
 LL | fn assert_send(_: impl Send) {}
@@ -52,7 +50,6 @@ LL |     assert_send(non_sync_with_method_call());
    |     ^^^^^^^^^^^ future returned by `non_sync_with_method_call` is not `Send`
    |
    = help: the trait `std::marker::Send` is not implemented for `dyn std::fmt::Write`
-   = note: future cannot be sent between threads safely
 note: future is not `Send` as this value is used across an await
   --> $DIR/async-fn-nonsend.rs:43:9
    |
@@ -65,7 +62,7 @@ LL |     }
 LL | }
    | - `f` is later dropped here
 
-error[E0277]: `*mut (dyn std::ops::Fn() + 'static)` cannot be shared between threads safely
+error[E0277]: future cannot be sent between threads safely
   --> $DIR/async-fn-nonsend.rs:54:5
    |
 LL | fn assert_send(_: impl Send) {}
@@ -75,7 +72,6 @@ LL |     assert_send(non_sync_with_method_call());
    |     ^^^^^^^^^^^ future returned by `non_sync_with_method_call` is not `Send`
    |
    = help: within `std::fmt::ArgumentV1<'_>`, the trait `std::marker::Sync` is not implemented for `*mut (dyn std::ops::Fn() + 'static)`
-   = note: future cannot be sent between threads safely
 note: future is not `Send` as this value is used across an await
   --> $DIR/async-fn-nonsend.rs:43:9
    |
diff --git a/src/test/ui/async-await/issue-64130-1-sync.stderr b/src/test/ui/async-await/issue-64130-1-sync.stderr
@@ -1,4 +1,4 @@
-error[E0277]: `Foo` cannot be shared between threads safely
+error[E0277]: future cannot be shared between threads safely
   --> $DIR/issue-64130-1-sync.rs:21:5
    |
 LL | fn is_sync<T: Sync>(t: T) { }
@@ -8,7 +8,6 @@ LL |     is_sync(bar());
    |     ^^^^^^^ future returned by `bar` is not `Sync`
    |
    = help: within `impl std::future::Future`, the trait `std::marker::Sync` is not implemented for `Foo`
-   = note: future cannot be shared between threads safely
 note: future is not `Sync` as this value is used across an await
   --> $DIR/issue-64130-1-sync.rs:15:5
    |
diff --git a/src/test/ui/async-await/issue-64130-2-send.stderr b/src/test/ui/async-await/issue-64130-2-send.stderr
@@ -1,4 +1,4 @@
-error[E0277]: `Foo` cannot be sent between threads safely
+error[E0277]: future cannot be sent between threads safely
   --> $DIR/issue-64130-2-send.rs:21:5
    |
 LL | fn is_send<T: Send>(t: T) { }
@@ -8,7 +8,6 @@ LL |     is_send(bar());
    |     ^^^^^^^ future returned by `bar` is not `Send`
    |
    = help: within `impl std::future::Future`, the trait `std::marker::Send` is not implemented for `Foo`
-   = note: future cannot be sent between threads safely
 note: future is not `Send` as this value is used across an await
   --> $DIR/issue-64130-2-send.rs:15:5
    |
diff --git a/src/test/ui/async-await/issue-64130-4-async-move.stderr b/src/test/ui/async-await/issue-64130-4-async-move.stderr
@@ -1,11 +1,10 @@
-error[E0277]: `(dyn std::any::Any + std::marker::Send + 'static)` cannot be shared between threads safely
+error[E0277]: future cannot be sent between threads safely
   --> $DIR/issue-64130-4-async-move.rs:15:17
    |
 LL | pub fn foo() -> impl Future + Send {
    |                 ^^^^^^^^^^^^^^^^^^ future returned by `foo` is not `Send`
    |
    = help: the trait `std::marker::Sync` is not implemented for `(dyn std::any::Any + std::marker::Send + 'static)`
-   = note: future cannot be sent between threads safely
 note: future is not `Send` as this value is used across an await
   --> $DIR/issue-64130-4-async-move.rs:21:26
    |
diff --git a/src/test/ui/async-await/issue-64130-non-send-future-diags.stderr b/src/test/ui/async-await/issue-64130-non-send-future-diags.stderr
@@ -1,4 +1,4 @@
-error[E0277]: `std::sync::MutexGuard<'_, u32>` cannot be sent between threads safely
+error[E0277]: future cannot be sent between threads safely
   --> $DIR/issue-64130-non-send-future-diags.rs:21:5
    |
 LL | fn is_send<T: Send>(t: T) { }
@@ -8,7 +8,6 @@ LL |     is_send(foo());
    |     ^^^^^^^ future returned by `foo` is not `Send`
    |
    = help: within `impl std::future::Future`, the trait `std::marker::Send` is not implemented for `std::sync::MutexGuard<'_, u32>`
-   = note: future cannot be sent between threads safely
 note: future is not `Send` as this value is used across an await
   --> $DIR/issue-64130-non-send-future-diags.rs:15:5
    |
diff --git a/src/test/ui/generator/not-send-sync.stderr b/src/test/ui/generator/not-send-sync.stderr
@@ -11,7 +11,7 @@ LL |     assert_send(|| {
    = note: required because of the requirements on the impl of `std::marker::Send` for `&std::cell::Cell<i32>`
    = note: required because it appears within the type `[generator@$DIR/not-send-sync.rs:16:17: 20:6 a:&std::cell::Cell<i32> _]`
 
-error[E0277]: `std::cell::Cell<i32>` cannot be shared between threads safely
+error[E0277]: future cannot be shared between threads safely
   --> $DIR/not-send-sync.rs:9:5
    |
 LL |     fn assert_sync<T: Sync>(_: T) {}
@@ -21,7 +21,6 @@ LL |     assert_sync(|| {
    |     ^^^^^^^^^^^ future returned by `main` is not `Sync`
    |
    = help: within `[generator@$DIR/not-send-sync.rs:9:17: 13:6 {std::cell::Cell<i32>, ()}]`, the trait `std::marker::Sync` is not implemented for `std::cell::Cell<i32>`
-   = note: future cannot be shared between threads safely
 note: future is not `Sync` as this value is used across an yield
   --> $DIR/not-send-sync.rs:12:9
    |

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		-error[E0277]: `std::rc::Rc<()>` cannot be sent between threads safely
	`1`	`+error[E0277]: future cannot be sent between threads safely`
`2`	`2`	`--> $DIR/async-fn-nonsend.rs:50:5`
`3`	`3`	`\|`
`4`	`4`	`LL \| fn assert_send(_: impl Send) {}`
`@@ -8,7 +8,6 @@ LL \| assert_send(local_dropped_before_await());`
`8`	`8`	\| ^^^^^^^^^^^ future returned by `local_dropped_before_await` is not `Send`
`9`	`9`	`\|`
`10`	`10`	= help: within `impl std::future::Future`, the trait `std::marker::Send` is not implemented for `std::rc::Rc<()>`
`11`		`- = note: future cannot be sent between threads safely`
`12`	`11`	note: future is not `Send` as this value is used across an await
`13`	`12`	`--> $DIR/async-fn-nonsend.rs:25:5`
`14`	`13`	`\|`
`@@ -20,7 +19,7 @@ LL \| fut().await;`
`20`	`19`	`LL \| }`
`21`	`20`	\| - `x` is later dropped here
`22`	`21`
`23`		-error[E0277]: `std::rc::Rc<()>` cannot be sent between threads safely
	`22`	`+error[E0277]: future cannot be sent between threads safely`
`24`	`23`	`--> $DIR/async-fn-nonsend.rs:52:5`
`25`	`24`	`\|`
`26`	`25`	`LL \| fn assert_send(_: impl Send) {}`
`@@ -30,7 +29,6 @@ LL \| assert_send(non_send_temporary_in_match());`
`30`	`29`	\| ^^^^^^^^^^^ future returned by `non_send_temporary_in_match` is not `Send`
`31`	`30`	`\|`
`32`	`31`	= help: within `impl std::future::Future`, the trait `std::marker::Send` is not implemented for `std::rc::Rc<()>`
`33`		`- = note: future cannot be sent between threads safely`
`34`	`32`	note: future is not `Send` as this value is used across an await
`35`	`33`	`--> $DIR/async-fn-nonsend.rs:34:20`
`36`	`34`	`\|`
`@@ -42,7 +40,7 @@ LL \| Some(_) => fut().await,`
`42`	`40`	`LL \| }`
`43`	`41`	\| - `non_send()` is later dropped here
`44`	`42`
`45`		-error[E0277]: `dyn std::fmt::Write` cannot be sent between threads safely
	`43`	`+error[E0277]: future cannot be sent between threads safely`
`46`	`44`	`--> $DIR/async-fn-nonsend.rs:54:5`
`47`	`45`	`\|`
`48`	`46`	`LL \| fn assert_send(_: impl Send) {}`
`@@ -52,7 +50,6 @@ LL \| assert_send(non_sync_with_method_call());`
`52`	`50`	\| ^^^^^^^^^^^ future returned by `non_sync_with_method_call` is not `Send`
`53`	`51`	`\|`
`54`	`52`	= help: the trait `std::marker::Send` is not implemented for `dyn std::fmt::Write`
`55`		`- = note: future cannot be sent between threads safely`
`56`	`53`	note: future is not `Send` as this value is used across an await
`57`	`54`	`--> $DIR/async-fn-nonsend.rs:43:9`
`58`	`55`	`\|`
`@@ -65,7 +62,7 @@ LL \| }`
`65`	`62`	`LL \| }`
`66`	`63`	\| - `f` is later dropped here
`67`	`64`
`68`		-error[E0277]: `*mut (dyn std::ops::Fn() + 'static)` cannot be shared between threads safely
	`65`	`+error[E0277]: future cannot be sent between threads safely`
`69`	`66`	`--> $DIR/async-fn-nonsend.rs:54:5`
`70`	`67`	`\|`
`71`	`68`	`LL \| fn assert_send(_: impl Send) {}`
`@@ -75,7 +72,6 @@ LL \| assert_send(non_sync_with_method_call());`
`75`	`72`	\| ^^^^^^^^^^^ future returned by `non_sync_with_method_call` is not `Send`
`76`	`73`	`\|`
`77`	`74`	= help: within `std::fmt::ArgumentV1<'_>`, the trait `std::marker::Sync` is not implemented for `*mut (dyn std::ops::Fn() + 'static)`
`78`		`- = note: future cannot be sent between threads safely`
`79`	`75`	note: future is not `Send` as this value is used across an await
`80`	`76`	`--> $DIR/async-fn-nonsend.rs:43:9`
`81`	`77`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		-error[E0277]: `Foo` cannot be shared between threads safely
	`1`	`+error[E0277]: future cannot be shared between threads safely`
`2`	`2`	`--> $DIR/issue-64130-1-sync.rs:21:5`
`3`	`3`	`\|`
`4`	`4`	`LL \| fn is_sync<T: Sync>(t: T) { }`
`@@ -8,7 +8,6 @@ LL \| is_sync(bar());`
`8`	`8`	\| ^^^^^^^ future returned by `bar` is not `Sync`
`9`	`9`	`\|`
`10`	`10`	= help: within `impl std::future::Future`, the trait `std::marker::Sync` is not implemented for `Foo`
`11`		`- = note: future cannot be shared between threads safely`
`12`	`11`	note: future is not `Sync` as this value is used across an await
`13`	`12`	`--> $DIR/issue-64130-1-sync.rs:15:5`
`14`	`13`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		-error[E0277]: `Foo` cannot be sent between threads safely
	`1`	`+error[E0277]: future cannot be sent between threads safely`
`2`	`2`	`--> $DIR/issue-64130-2-send.rs:21:5`
`3`	`3`	`\|`
`4`	`4`	`LL \| fn is_send<T: Send>(t: T) { }`
`@@ -8,7 +8,6 @@ LL \| is_send(bar());`
`8`	`8`	\| ^^^^^^^ future returned by `bar` is not `Send`
`9`	`9`	`\|`
`10`	`10`	= help: within `impl std::future::Future`, the trait `std::marker::Send` is not implemented for `Foo`
`11`		`- = note: future cannot be sent between threads safely`
`12`	`11`	note: future is not `Send` as this value is used across an await
`13`	`12`	`--> $DIR/issue-64130-2-send.rs:15:5`
`14`	`13`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,10 @@`
`1`		-error[E0277]: `(dyn std::any::Any + std::marker::Send + 'static)` cannot be shared between threads safely
	`1`	`+error[E0277]: future cannot be sent between threads safely`
`2`	`2`	`--> $DIR/issue-64130-4-async-move.rs:15:17`
`3`	`3`	`\|`
`4`	`4`	`LL \| pub fn foo() -> impl Future + Send {`
`5`	`5`	\| ^^^^^^^^^^^^^^^^^^ future returned by `foo` is not `Send`
`6`	`6`	`\|`
`7`	`7`	= help: the trait `std::marker::Sync` is not implemented for `(dyn std::any::Any + std::marker::Send + 'static)`
`8`		`- = note: future cannot be sent between threads safely`
`9`	`8`	note: future is not `Send` as this value is used across an await
`10`	`9`	`--> $DIR/issue-64130-4-async-move.rs:21:26`
`11`	`10`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		-error[E0277]: `std::sync::MutexGuard<'_, u32>` cannot be sent between threads safely
	`1`	`+error[E0277]: future cannot be sent between threads safely`
`2`	`2`	`--> $DIR/issue-64130-non-send-future-diags.rs:21:5`
`3`	`3`	`\|`
`4`	`4`	`LL \| fn is_send<T: Send>(t: T) { }`
`@@ -8,7 +8,6 @@ LL \| is_send(foo());`
`8`	`8`	\| ^^^^^^^ future returned by `foo` is not `Send`
`9`	`9`	`\|`
`10`	`10`	= help: within `impl std::future::Future`, the trait `std::marker::Send` is not implemented for `std::sync::MutexGuard<'_, u32>`
`11`		`- = note: future cannot be sent between threads safely`
`12`	`11`	note: future is not `Send` as this value is used across an await
`13`	`12`	`--> $DIR/issue-64130-non-send-future-diags.rs:15:5`
`14`	`13`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ LL \| assert_send(\|\| {`
`11`	`11`	= note: required because of the requirements on the impl of `std::marker::Send` for `&std::cell::Cell<i32>`
`12`	`12`	= note: required because it appears within the type `[generator@$DIR/not-send-sync.rs:16:17: 20:6 a:&std::cell::Cell<i32> _]`
`13`	`13`
`14`		-error[E0277]: `std::cell::Cell<i32>` cannot be shared between threads safely
	`14`	`+error[E0277]: future cannot be shared between threads safely`
`15`	`15`	`--> $DIR/not-send-sync.rs:9:5`
`16`	`16`	`\|`
`17`	`17`	`LL \| fn assert_sync<T: Sync>(_: T) {}`
`@@ -21,7 +21,6 @@ LL \| assert_sync(\|\| {`
`21`	`21`	\| ^^^^^^^^^^^ future returned by `main` is not `Sync`
`22`	`22`	`\|`
`23`	`23`	= help: within `[generator@$DIR/not-send-sync.rs:9:17: 13:6 {std::cell::Cell<i32>, ()}]`, the trait `std::marker::Sync` is not implemented for `std::cell::Cell<i32>`
`24`		`- = note: future cannot be shared between threads safely`
`25`	`24`	note: future is not `Sync` as this value is used across an yield
`26`	`25`	`--> $DIR/not-send-sync.rs:12:9`
`27`	`26`	`\|`