Update UI test

Author: Kobzol

tests/ui/deriving/deriving-from-wrong-target.rs

@@ -5,41 +5,27 @@
 #![allow(dead_code)]
 
 #[derive(From)]
+//~^ ERROR `#[derive(From)]` used on a struct with no fields
 struct S1;
-//~^ ERROR `#[derive(From)]` can only be used on structs with a single field
 
 #[derive(From)]
+//~^ ERROR `#[derive(From)]` used on a struct with no fields
 struct S2 {}
-//~^ ERROR `#[derive(From)]` can only be used on structs with a single field
 
 #[derive(From)]
+//~^ ERROR `#[derive(From)]` used on a struct with multiple fields
 struct S3(u32, bool);
-//~^ ERROR `#[derive(From)]` can only be used on structs with a single field
 
 #[derive(From)]
-//~v ERROR `#[derive(From)]` can only be used on structs with a single field
+//~^ ERROR `#[derive(From)]` used on a struct with multiple fields
 struct S4 {
     a: u32,
     b: bool,
 }
 
 #[derive(From)]
+//~^ ERROR `#[derive(From)]` used on an enum
 enum E1 {}
-//~^ ERROR `#[derive(From)]` can only be used on structs with a single field
-
-#[derive(From)]
-//~v ERROR `#[derive(From)]` can only be used on structs with a single field
-enum E2 {
-    V1,
-    V2,
-}
-
-#[derive(From)]
-//~v ERROR `#[derive(From)]` can only be used on structs with a single field
-enum E3 {
-    V1(u32),
-    V2(bool),
-}
 
 #[derive(From)]
 //~^ ERROR the size for values of type `T` cannot be known at compilation time [E0277]

tests/ui/deriving/deriving-from-wrong-target.stderr

@@ -1,56 +1,60 @@
-error: `#[derive(From)]` can only be used on structs with a single field
-  --> $DIR/deriving-from-wrong-target.rs:8:1
+error: `#[derive(From)]` used on a struct with no fields
+  --> $DIR/deriving-from-wrong-target.rs:7:10
    |
+LL | #[derive(From)]
+   |          ^^^^
+LL |
 LL | struct S1;
-   | ^^^^^^^^^^
+   |        ^^
+   |
+   = note: `#[derive(From)]` can only be used on structs with exactly one field
 
-error: `#[derive(From)]` can only be used on structs with a single field
-  --> $DIR/deriving-from-wrong-target.rs:12:1
+error: `#[derive(From)]` used on a struct with no fields
+  --> $DIR/deriving-from-wrong-target.rs:11:10
    |
+LL | #[derive(From)]
+   |          ^^^^
+LL |
 LL | struct S2 {}
-   | ^^^^^^^^^^^^
+   |        ^^
+   |
+   = note: `#[derive(From)]` can only be used on structs with exactly one field
 
-error: `#[derive(From)]` can only be used on structs with a single field
-  --> $DIR/deriving-from-wrong-target.rs:16:1
+error: `#[derive(From)]` used on a struct with multiple fields
+  --> $DIR/deriving-from-wrong-target.rs:15:10
    |
+LL | #[derive(From)]
+   |          ^^^^
+LL |
 LL | struct S3(u32, bool);
-   | ^^^^^^^^^^^^^^^^^^^^^
+   |        ^^
+   |
+   = note: `#[derive(From)]` can only be used on structs with exactly one field
 
-error: `#[derive(From)]` can only be used on structs with a single field
-  --> $DIR/deriving-from-wrong-target.rs:21:1
-   |
-LL | / struct S4 {
-LL | |     a: u32,
-LL | |     b: bool,
-LL | | }
-   | |_^
+error: `#[derive(From)]` used on a struct with multiple fields
+  --> $DIR/deriving-from-wrong-target.rs:19:10
+   |
+LL | #[derive(From)]
+   |          ^^^^
+LL |
+LL | struct S4 {
+   |        ^^
+   |
+   = note: `#[derive(From)]` can only be used on structs with exactly one field
 
-error: `#[derive(From)]` can only be used on structs with a single field
-  --> $DIR/deriving-from-wrong-target.rs:27:1
+error: `#[derive(From)]` used on an enum
+  --> $DIR/deriving-from-wrong-target.rs:26:10
    |
+LL | #[derive(From)]
+   |          ^^^^
+LL |
 LL | enum E1 {}
-   | ^^^^^^^^^^
-
-error: `#[derive(From)]` can only be used on structs with a single field
-  --> $DIR/deriving-from-wrong-target.rs:32:1
-   |
-LL | / enum E2 {
-LL | |     V1,
-LL | |     V2,
-LL | | }
-   | |_^
-
-error: `#[derive(From)]` can only be used on structs with a single field
-  --> $DIR/deriving-from-wrong-target.rs:39:1
-   |
-LL | / enum E3 {
-LL | |     V1(u32),
-LL | |     V2(bool),
-LL | | }
-   | |_^
+   |      ^^
+   |
+   = note: `#[derive(From)]` can only be used on structs with exactly one field
 
 error[E0277]: the size for values of type `T` cannot be known at compilation time
-  --> $DIR/deriving-from-wrong-target.rs:44:10
+  --> $DIR/deriving-from-wrong-target.rs:30:10
    |
 LL | #[derive(From)]
    |          ^^^^ doesn't have a size known at compile-time
@@ -67,7 +71,7 @@ LL + struct SUnsizedField<T> {
    |
 
 error[E0277]: the size for values of type `T` cannot be known at compilation time
-  --> $DIR/deriving-from-wrong-target.rs:44:10
+  --> $DIR/deriving-from-wrong-target.rs:30:10
    |
 LL | #[derive(From)]
    |          ^^^^ doesn't have a size known at compile-time
@@ -76,7 +80,7 @@ LL | struct SUnsizedField<T: ?Sized> {
    |                      - this type parameter needs to be `Sized`
    |
 note: required because it appears within the type `SUnsizedField<T>`
-  --> $DIR/deriving-from-wrong-target.rs:47:8
+  --> $DIR/deriving-from-wrong-target.rs:33:8
    |
 LL | struct SUnsizedField<T: ?Sized> {
    |        ^^^^^^^^^^^^^
@@ -88,7 +92,7 @@ LL + struct SUnsizedField<T> {
    |
 
 error[E0277]: the size for values of type `T` cannot be known at compilation time
-  --> $DIR/deriving-from-wrong-target.rs:48:11
+  --> $DIR/deriving-from-wrong-target.rs:34:11
    |
 LL | struct SUnsizedField<T: ?Sized> {
    |                      - this type parameter needs to be `Sized`
@@ -106,6 +110,6 @@ help: function arguments must have a statically known size, borrowed types alway
 LL |     last: &T,
    |           +
 
-error: aborting due to 10 previous errors
+error: aborting due to 8 previous errors
 
 For more information about this error, try `rustc --explain E0277`.