Update ui tests to 2018 edition

test_suite/tests/ui/identifier/both.rs

@@ -1,5 +1,4 @@
-#[macro_use]
-extern crate serde_derive;
+use serde_derive::Deserialize;
 
 #[derive(Deserialize)]
 #[serde(field_identifier, variant_identifier)]

test_suite/tests/ui/identifier/both.stderr

@@ -1,13 +1,13 @@
 error: #[serde(field_identifier)] and #[serde(variant_identifier)] cannot both be set
- --> $DIR/both.rs:5:9
+ --> $DIR/both.rs:4:9
   |
-5 | #[serde(field_identifier, variant_identifier)]
+4 | #[serde(field_identifier, variant_identifier)]
   |         ^^^^^^^^^^^^^^^^
 
 error: #[serde(field_identifier)] and #[serde(variant_identifier)] cannot both be set
- --> $DIR/both.rs:5:27
+ --> $DIR/both.rs:4:27
   |
-5 | #[serde(field_identifier, variant_identifier)]
+4 | #[serde(field_identifier, variant_identifier)]
   |                           ^^^^^^^^^^^^^^^^^^
 
 error: aborting due to 2 previous errors

test_suite/tests/ui/identifier/field_struct.rs

@@ -1,5 +1,4 @@
-#[macro_use]
-extern crate serde_derive;
+use serde_derive::Deserialize;
 
 #[derive(Deserialize)]
 #[serde(field_identifier)]

test_suite/tests/ui/identifier/field_struct.stderr

@@ -1,7 +1,7 @@
 error: #[serde(field_identifier)] can only be used on an enum
- --> $DIR/field_struct.rs:6:1
+ --> $DIR/field_struct.rs:5:1
   |
-6 | struct S;
+5 | struct S;
   | ^^^^^^
 
 error: aborting due to previous error

test_suite/tests/ui/identifier/field_tuple.rs

@@ -1,5 +1,4 @@
-#[macro_use]
-extern crate serde_derive;
+use serde_derive::Deserialize;
 
 #[derive(Deserialize)]
 #[serde(field_identifier)]

test_suite/tests/ui/identifier/field_tuple.stderr

@@ -1,7 +1,7 @@
 error: #[serde(field_identifier)] may only contain unit variants
- --> $DIR/field_tuple.rs:8:5
+ --> $DIR/field_tuple.rs:7:5
   |
-8 |     B(u8, u8),
+7 |     B(u8, u8),
   |     ^^^^^^^^^
 
 error: aborting due to previous error

test_suite/tests/ui/identifier/newtype_not_last.rs

@@ -1,5 +1,4 @@
-#[macro_use]
-extern crate serde_derive;
+use serde_derive::Deserialize;
 
 #[derive(Deserialize)]
 #[serde(field_identifier)]

test_suite/tests/ui/identifier/newtype_not_last.stderr

@@ -1,7 +1,7 @@
 error: `Other` must be the last variant
- --> $DIR/newtype_not_last.rs:8:5
+ --> $DIR/newtype_not_last.rs:7:5
   |
-8 |     Other(String),
+7 |     Other(String),
   |     ^^^^^^^^^^^^^
 
 error: aborting due to previous error

test_suite/tests/ui/identifier/not_unit.rs

@@ -1,5 +1,4 @@
-#[macro_use]
-extern crate serde_derive;
+use serde_derive::Deserialize;
 
 #[derive(Deserialize)]
 #[serde(field_identifier)]

test_suite/tests/ui/identifier/not_unit.stderr

@@ -1,8 +1,8 @@
 error: #[serde(other)] must be on a unit variant
- --> $DIR/not_unit.rs:8:5
+ --> $DIR/not_unit.rs:7:5
   |
-8 | /     #[serde(other)]
-9 | |     Other(u8, u8),
+7 | /     #[serde(other)]
+8 | |     Other(u8, u8),
   | |_________________^
 
 error: aborting due to previous error

test_suite/tests/ui/identifier/other_not_last.rs

@@ -1,5 +1,4 @@
-#[macro_use]
-extern crate serde_derive;
+use serde_derive::Deserialize;
 
 #[derive(Deserialize)]
 #[serde(field_identifier)]

test_suite/tests/ui/identifier/other_not_last.stderr

@@ -1,8 +1,8 @@
 error: #[serde(other)] must be on the last variant
- --> $DIR/other_not_last.rs:8:5
+ --> $DIR/other_not_last.rs:7:5
   |
-8 | /     #[serde(other)]
-9 | |     Other,
+7 | /     #[serde(other)]
+8 | |     Other,
   | |_________^
 
 error: aborting due to previous error

test_suite/tests/ui/identifier/other_untagged.rs

@@ -1,5 +1,4 @@
-#[macro_use]
-extern crate serde_derive;
+use serde_derive::Deserialize;
 
 #[derive(Deserialize)]
 #[serde(untagged)]

test_suite/tests/ui/identifier/other_untagged.stderr

@@ -1,8 +1,8 @@
 error: #[serde(other)] cannot appear on untagged enum
- --> $DIR/other_untagged.rs:7:5
+ --> $DIR/other_untagged.rs:6:5
   |
-7 | /     #[serde(other)]
-8 | |     Other,
+6 | /     #[serde(other)]
+7 | |     Other,
   | |_________^
 
 error: aborting due to previous error

test_suite/tests/ui/identifier/other_variant.rs

@@ -1,5 +1,4 @@
-#[macro_use]
-extern crate serde_derive;
+use serde_derive::Deserialize;
 
 #[derive(Deserialize)]
 #[serde(variant_identifier)]

test_suite/tests/ui/identifier/other_variant.stderr

@@ -1,8 +1,8 @@
 error: #[serde(other)] may not be used on a variant identifier
- --> $DIR/other_variant.rs:7:5
+ --> $DIR/other_variant.rs:6:5
   |
-7 | /     #[serde(other)]
-8 | |     Other,
+6 | /     #[serde(other)]
+7 | |     Other,
   | |_________^
 
 error: aborting due to previous error

test_suite/tests/ui/identifier/variant_struct.rs

@@ -1,5 +1,4 @@
-#[macro_use]
-extern crate serde_derive;
+use serde_derive::Deserialize;
 
 #[derive(Deserialize)]
 #[serde(variant_identifier)]

test_suite/tests/ui/identifier/variant_struct.stderr

@@ -1,7 +1,7 @@
 error: #[serde(variant_identifier)] can only be used on an enum
- --> $DIR/variant_struct.rs:6:1
+ --> $DIR/variant_struct.rs:5:1
   |
-6 | struct S;
+5 | struct S;
   | ^^^^^^
 
 error: aborting due to previous error

test_suite/tests/ui/identifier/variant_tuple.rs

@@ -1,5 +1,4 @@
-#[macro_use]
-extern crate serde_derive;
+use serde_derive::Deserialize;
 
 #[derive(Deserialize)]
 #[serde(variant_identifier)]

test_suite/tests/ui/identifier/variant_tuple.stderr

@@ -1,7 +1,7 @@
 error: #[serde(variant_identifier)] may only contain unit variants
- --> $DIR/variant_tuple.rs:8:5
+ --> $DIR/variant_tuple.rs:7:5
   |
-8 |     B(u8, u8),
+7 |     B(u8, u8),
   |     ^^^^^^^^^
 
 error: aborting due to previous error