Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 40 deletions

diff --git a/src/test/ui/did_you_mean/issue-56028-there-is-an-enum-variant.stderr b/src/test/ui/did_you_mean/issue-56028-there-is-an-enum-variant.stderr
deleted file mode 100644
index abc040c05..000000000
--- a/src/test/ui/did_you_mean/issue-56028-there-is-an-enum-variant.stderr
+++ /dev/null
@@ -1,40 +0,0 @@
-error[E0412]: cannot find type `Set` in this scope
-  --> $DIR/issue-56028-there-is-an-enum-variant.rs:9:15
-   |
-LL | fn setup() -> Set { Set }
-   |               ^^^ not found in this scope
-   |
-help: there is an enum variant `AffixHeart::Set` and 7 others; try using the variant's enum
-   |
-LL | fn setup() -> AffixHeart { Set }
-   |               ~~~~~~~~~~
-LL | fn setup() -> CauseToBe { Set }
-   |               ~~~~~~~~~
-LL | fn setup() -> Determine { Set }
-   |               ~~~~~~~~~
-LL | fn setup() -> PutDown { Set }
-   |               ~~~~~~~
-     and 3 other candidates
-
-error[E0425]: cannot find value `Set` in this scope
-  --> $DIR/issue-56028-there-is-an-enum-variant.rs:9:21
-   |
-LL | fn setup() -> Set { Set }
-   |                     ^^^ not found in this scope
-   |
-help: consider importing one of these items
-   |
-LL | use AffixHeart::Set;
-   |
-LL | use CauseToBe::Set;
-   |
-LL | use Determine::Set;
-   |
-LL | use PutDown::Set;
-   |
-     and 3 other candidates
-
-error: aborting due to 2 previous errors
-
-Some errors have detailed explanations: E0412, E0425.
-For more information about an error, try `rustc --explain E0412`.