Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 0 insertions, 24 deletions

diff --git a/src/test/ui/builtin-superkinds/builtin-superkinds-in-metadata.stderr b/src/test/ui/builtin-superkinds/builtin-superkinds-in-metadata.stderr
deleted file mode 100644
index a46e4b233..000000000
--- a/src/test/ui/builtin-superkinds/builtin-superkinds-in-metadata.stderr
+++ /dev/null
@@ -1,24 +0,0 @@
-error[E0277]: `T` cannot be sent between threads safely
-  --> $DIR/builtin-superkinds-in-metadata.rs:13:23
-   |
-LL | impl <T:Sync+'static> RequiresRequiresShareAndSend for X<T> { }
-   |                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `T` cannot be sent between threads safely
-   |
-note: required because it appears within the type `X<T>`
-  --> $DIR/builtin-superkinds-in-metadata.rs:9:8
-   |
-LL | struct X<T>(T);
-   |        ^
-note: required by a bound in `RequiresRequiresShareAndSend`
-  --> $DIR/auxiliary/trait_superkinds_in_metadata.rs:7:58
-   |
-LL | pub trait RequiresRequiresShareAndSend : RequiresShare + Send { }
-   |                                                          ^^^^ required by this bound in `RequiresRequiresShareAndSend`
-help: consider further restricting this bound
-   |
-LL | impl <T:Sync+'static + std::marker::Send> RequiresRequiresShareAndSend for X<T> { }
-   |                      +++++++++++++++++++
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0277`.