Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 34 deletions

diff --git a/src/test/ui/derives/derive-assoc-type-not-impl.stderr b/src/test/ui/derives/derive-assoc-type-not-impl.stderr
deleted file mode 100644
index c4fddcf5f..000000000
--- a/src/test/ui/derives/derive-assoc-type-not-impl.stderr
+++ /dev/null
@@ -1,34 +0,0 @@
-error[E0599]: the method `clone` exists for struct `Bar<NotClone>`, but its trait bounds were not satisfied
-  --> $DIR/derive-assoc-type-not-impl.rs:18:30
-   |
-LL | struct Bar<T: Foo> {
-   | ------------------
-   | |
-   | method `clone` not found for this struct
-   | doesn't satisfy `Bar<NotClone>: Clone`
-...
-LL | struct NotClone;
-   | --------------- doesn't satisfy `NotClone: Clone`
-...
-LL |     Bar::<NotClone> { x: 1 }.clone();
-   |                              ^^^^^ method cannot be called on `Bar<NotClone>` due to unsatisfied trait bounds
-   |
-note: trait bound `NotClone: Clone` was not satisfied
-  --> $DIR/derive-assoc-type-not-impl.rs:6:10
-   |
-LL | #[derive(Clone)]
-   |          ^^^^^ unsatisfied trait bound introduced in this `derive` macro
-   = note: the following trait bounds were not satisfied:
-           `NotClone: Clone`
-           which is required by `Bar<NotClone>: Clone`
-   = help: items from traits can only be used if the trait is implemented and in scope
-   = note: the following trait defines an item `clone`, perhaps you need to implement it:
-           candidate #1: `Clone`
-help: consider annotating `NotClone` with `#[derive(Clone)]`
-   |
-LL | #[derive(Clone)]
-   |
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0599`.