Auto merge of #57108 - Mark-Simulacrum:license-remove, r=pietroalbini

[rust.git] / src / test / ui / issues / issue-35675.stderr

diff --git a/src/test/ui/issues/issue-35675.stderr b/src/test/ui/issues/issue-35675.stderr
index fef8de3a28d9ea2e68820a0863528637a4377f16..3e4fd5593caae56c0a74c99162b6ae56707626ed 100644 (file)
--- a/src/test/ui/issues/issue-35675.stderr
+++ b/src/test/ui/issues/issue-35675.stderr
@@ -1,14 +1,15 @@
 error[E0412]: cannot find type `Apple` in this scope
-  --> $DIR/issue-35675.rs:17:29
+  --> $DIR/issue-35675.rs:7:29
    |
 LL | fn should_return_fruit() -> Apple {
+   |                             ^^^^^ not found in this scope
+help: there is an enum variant `Fruit::Apple`; try using the variant's enum
+   |
+LL | fn should_return_fruit() -> Fruit {
    |                             ^^^^^
-   |                             |
-   |                             not found in this scope
-   |                             help: you can try using the variant's enum: `Fruit`
 
 error[E0425]: cannot find function `Apple` in this scope
-  --> $DIR/issue-35675.rs:19:5
+  --> $DIR/issue-35675.rs:9:5
    |
 LL |     Apple(5)
    |     ^^^^^ not found in this scope
@@ -18,16 +19,16 @@ LL | use Fruit::Apple;
    |
 
 error[E0573]: expected type, found variant `Fruit::Apple`
-  --> $DIR/issue-35675.rs:23:33
+  --> $DIR/issue-35675.rs:13:33
    |
 LL | fn should_return_fruit_too() -> Fruit::Apple {
    |                                 ^^^^^^^^^^^^
    |                                 |
    |                                 not a type
-   |                                 help: you can try using the variant's enum: `Fruit`
+   |                                 help: try using the variant's enum: `Fruit`
 
 error[E0425]: cannot find function `Apple` in this scope
-  --> $DIR/issue-35675.rs:25:5
+  --> $DIR/issue-35675.rs:15:5
    |
 LL |     Apple(5)
    |     ^^^^^ not found in this scope
@@ -37,31 +38,32 @@ LL | use Fruit::Apple;
    |
 
 error[E0573]: expected type, found variant `Ok`
-  --> $DIR/issue-35675.rs:29:13
+  --> $DIR/issue-35675.rs:19:13
    |
 LL | fn foo() -> Ok {
-   |             ^^ not a type
-   |
-   = help: there is an enum variant `std::prelude::v1::Ok`, try using `std::prelude::v1`?
-   = help: there is an enum variant `std::result::Result::Ok`, try using `std::result::Result`?
+   |             ^^
+   |             |
+   |             not a type
+   |             help: try using the variant's enum: `std::result::Result`
 
 error[E0412]: cannot find type `Variant3` in this scope
-  --> $DIR/issue-35675.rs:34:13
+  --> $DIR/issue-35675.rs:24:13
    |
 LL | fn bar() -> Variant3 {
-   |             ^^^^^^^^
-   |             |
-   |             not found in this scope
-   |             help: you can try using the variant's enum: `x::Enum`
+   |             ^^^^^^^^ not found in this scope
+help: there is an enum variant `x::Enum::Variant3`; try using the variant's enum
+   |
+LL | fn bar() -> x::Enum {
+   |             ^^^^^^^
 
 error[E0573]: expected type, found variant `Some`
-  --> $DIR/issue-35675.rs:38:13
+  --> $DIR/issue-35675.rs:28:13
    |
 LL | fn qux() -> Some {
-   |             ^^^^ not a type
-   |
-   = help: there is an enum variant `std::prelude::v1::Option::Some`, try using `std::prelude::v1::Option`?
-   = help: there is an enum variant `std::prelude::v1::Some`, try using `std::prelude::v1`?
+   |             ^^^^
+   |             |
+   |             not a type
+   |             help: try using the variant's enum: `Option`
 
 error: aborting due to 7 previous errors