Rollup merge of rust-lang#114182 - Ddystopia:cleanup-after-113312, r=lcnr

matthiaskrgr · web-flow · commit 7c6942a11bb4 · 2023-07-31T22:51:14.000+02:00
clean up after 113312 Minor edits for rust-lang#113312 cc ``@RalfJung`` r? ``@lcnr``
diff --git a/tests/ui/auto-traits/issue-83857-ub.rs b/tests/ui/auto-traits/issue-83857-ub.rs
@@ -1,4 +1,6 @@
 #![allow(suspicious_auto_trait_impls)]
+// Tests that we don't incorrectly allow overlap between a builtin auto trait
+// impl and a user written one. See #83857 for more details
 
 struct Always<T, U>(T, U);
 unsafe impl<T, U> Send for Always<T, U> {}
diff --git a/tests/ui/auto-traits/issue-83857-ub.stderr b/tests/ui/auto-traits/issue-83857-ub.stderr
@@ -1,12 +1,12 @@
 error[E0277]: `Foo<T, U>` cannot be sent between threads safely
-  --> $DIR/issue-83857-ub.rs:20:38
+  --> $DIR/issue-83857-ub.rs:22:38
    |
 LL | fn generic<T, U>(v: Foo<T, U>, f: fn(<Foo<T, U> as WithAssoc>::Output) -> i32) {
    |                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `Foo<T, U>` cannot be sent between threads safely
    |
    = help: the trait `Send` is not implemented for `Foo<T, U>`
 note: required for `Foo<T, U>` to implement `WithAssoc`
-  --> $DIR/issue-83857-ub.rs:13:15
+  --> $DIR/issue-83857-ub.rs:15:15
    |
 LL | impl<T: Send> WithAssoc for T {
    |         ----  ^^^^^^^^^     ^
diff --git a/tests/ui/impl-trait/auto-trait-leak b/tests/ui/impl-trait/auto-trait-leak

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`	`1`	error[E0277]: `Foo<T, U>` cannot be sent between threads safely
`2`		`- --> $DIR/issue-83857-ub.rs:20:38`
	`2`	`+ --> $DIR/issue-83857-ub.rs:22:38`
`3`	`3`	`\|`
`4`	`4`	`LL \| fn generic<T, U>(v: Foo<T, U>, f: fn(<Foo<T, U> as WithAssoc>::Output) -> i32) {`
`5`	`5`	\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `Foo<T, U>` cannot be sent between threads safely
`6`	`6`	`\|`
`7`	`7`	= help: the trait `Send` is not implemented for `Foo<T, U>`
`8`	`8`	note: required for `Foo<T, U>` to implement `WithAssoc`
`9`		`- --> $DIR/issue-83857-ub.rs:13:15`
	`9`	`+ --> $DIR/issue-83857-ub.rs:15:15`
`10`	`10`	`\|`
`11`	`11`	`LL \| impl<T: Send> WithAssoc for T {`
`12`	`12`	`\| ---- ^^^^^^^^^ ^`