diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-07-31 22:51:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-31 22:51:14 +0200 |
| commit | 7c6942a11bb49c7847fb565d38dc9318c6ac5117 (patch) | |
| tree | 61ddda3166bd7103ef6d03349e7cfa34123b76bd | |
| parent | 35ba616850b567fef8b2cb19c57b624d0922654a (diff) | |
| parent | 63845e78e18a906e8920b0f823001ee7218e118f (diff) | |
| download | rust-7c6942a11bb49c7847fb565d38dc9318c6ac5117.tar.gz rust-7c6942a11bb49c7847fb565d38dc9318c6ac5117.zip | |
Rollup merge of #114182 - Ddystopia:cleanup-after-113312, r=lcnr
clean up after 113312 Minor edits for #113312 cc ``@RalfJung`` r? ``@lcnr``
| -rw-r--r-- | tests/ui/auto-traits/issue-83857-ub.rs | 2 | ||||
| -rw-r--r-- | tests/ui/auto-traits/issue-83857-ub.stderr | 4 | ||||
| -rw-r--r-- | tests/ui/impl-trait/auto-trait-leak | 0 |
3 files changed, 4 insertions, 2 deletions
diff --git a/tests/ui/auto-traits/issue-83857-ub.rs b/tests/ui/auto-traits/issue-83857-ub.rs index 0a8865295c6..626e60c37f6 100644 --- 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 index d2aef17e7f8..23a2f62d905 100644 --- 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 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/tests/ui/impl-trait/auto-trait-leak +++ /dev/null |