Update ui tests to 2018 edition

test_suite/tests/compiletest.rs

@@ -7,7 +7,12 @@ fn ui() {
     let config = compiletest::Config {
         mode: compiletest::common::Mode::Ui,
         src_base: std::path::PathBuf::from("tests/ui"),
-        target_rustcflags: Some("-L deps/target/debug/deps".to_owned()),
+        target_rustcflags: Some(String::from("\
+            --edition=2018 \
+            -L deps/target/debug/deps \
+            -Z unstable-options \
+            --extern serde_derive \
+        ")),
         ..Default::default()
     };
 

test_suite/tests/ui/borrow/bad_lifetimes.rs

@@ -1,5 +1,4 @@
-#[macro_use]
-extern crate serde_derive;
+use serde_derive::Deserialize;
 
 #[derive(Deserialize)]
 struct Test<'a> {

test_suite/tests/ui/borrow/bad_lifetimes.stderr

@@ -1,7 +1,7 @@
 error: failed to parse borrowed lifetimes: "zzz"
- --> $DIR/bad_lifetimes.rs:6:22
+ --> $DIR/bad_lifetimes.rs:5:22
   |
-6 |     #[serde(borrow = "zzz")]
+5 |     #[serde(borrow = "zzz")]
   |                      ^^^^^
 
 error: aborting due to previous error

test_suite/tests/ui/borrow/duplicate_lifetime.rs

@@ -1,5 +1,4 @@
-#[macro_use]
-extern crate serde_derive;
+use serde_derive::Deserialize;
 
 #[derive(Deserialize)]
 struct Test<'a> {

test_suite/tests/ui/borrow/duplicate_lifetime.stderr

@@ -1,7 +1,7 @@
 error: duplicate borrowed lifetime `'a`
- --> $DIR/duplicate_lifetime.rs:6:22
+ --> $DIR/duplicate_lifetime.rs:5:22
   |
-6 |     #[serde(borrow = "'a + 'a")]
+5 |     #[serde(borrow = "'a + 'a")]
   |                      ^^^^^^^^^
 
 error: aborting due to previous error

test_suite/tests/ui/borrow/duplicate_variant.rs

@@ -1,5 +1,4 @@
-#[macro_use]
-extern crate serde_derive;
+use serde_derive::Deserialize;
 
 #[derive(Deserialize)]
 struct Str<'a>(&'a str);

test_suite/tests/ui/borrow/duplicate_variant.stderr

@@ -1,7 +1,7 @@
 error: duplicate serde attribute `borrow`
- --> $DIR/duplicate_variant.rs:9:13
+ --> $DIR/duplicate_variant.rs:8:13
   |
-9 |     #[serde(borrow)]
+8 |     #[serde(borrow)]
   |             ^^^^^^
 
 error: aborting due to previous error

test_suite/tests/ui/borrow/empty_lifetimes.rs

@@ -1,5 +1,4 @@
-#[macro_use]
-extern crate serde_derive;
+use serde_derive::Deserialize;
 
 #[derive(Deserialize)]
 struct Test<'a> {

test_suite/tests/ui/borrow/empty_lifetimes.stderr

@@ -1,7 +1,7 @@
 error: at least one lifetime must be borrowed
- --> $DIR/empty_lifetimes.rs:6:22
+ --> $DIR/empty_lifetimes.rs:5:22
   |
-6 |     #[serde(borrow = "")]
+5 |     #[serde(borrow = "")]
   |                      ^^
 
 error: aborting due to previous error

test_suite/tests/ui/borrow/no_lifetimes.rs

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

test_suite/tests/ui/borrow/no_lifetimes.stderr

@@ -1,8 +1,8 @@
 error: field `s` has no lifetimes to borrow
- --> $DIR/no_lifetimes.rs:6:5
+ --> $DIR/no_lifetimes.rs:5:5
   |
-6 | /     #[serde(borrow)]
-7 | |     s: String,
+5 | /     #[serde(borrow)]
+6 | |     s: String,
   | |_____________^
 
 error: aborting due to previous error

test_suite/tests/ui/borrow/struct_variant.rs

@@ -1,5 +1,4 @@
-#[macro_use]
-extern crate serde_derive;
+use serde_derive::Deserialize;
 
 #[derive(Deserialize)]
 struct Str<'a>(&'a str);

test_suite/tests/ui/borrow/struct_variant.stderr

@@ -1,9 +1,9 @@
 error: #[serde(borrow)] may only be used on newtype variants
-  --> $DIR/struct_variant.rs:9:5
-   |
-9  | /     #[serde(borrow)]
-10 | |     S { s: Str<'a> },
-   | |____________________^
+ --> $DIR/struct_variant.rs:8:5
+  |
+8 | /     #[serde(borrow)]
+9 | |     S { s: Str<'a> },
+  | |____________________^
 
 error: aborting due to previous error
 

test_suite/tests/ui/borrow/wrong_lifetime.rs

@@ -1,5 +1,4 @@
-#[macro_use]
-extern crate serde_derive;
+use serde_derive::Deserialize;
 
 #[derive(Deserialize)]
 struct Test<'a> {

test_suite/tests/ui/borrow/wrong_lifetime.stderr

@@ -1,8 +1,8 @@
 error: field `s` does not have lifetime 'b
- --> $DIR/wrong_lifetime.rs:6:5
+ --> $DIR/wrong_lifetime.rs:5:5
   |
-6 | /     #[serde(borrow = "'b")]
-7 | |     s: &'a str,
+5 | /     #[serde(borrow = "'b")]
+6 | |     s: &'a str,
   | |______________^
 
 error: aborting due to previous error

test_suite/tests/ui/conflict/adjacent-tag.rs

@@ -1,5 +1,4 @@
-#[macro_use]
-extern crate serde_derive;
+use serde_derive::Serialize;
 
 #[derive(Serialize)]
 #[serde(tag = "conflict", content = "conflict")]

test_suite/tests/ui/conflict/adjacent-tag.stderr

@@ -1,11 +1,11 @@
 error: enum tags `conflict` for type and content conflict with each other
- --> $DIR/adjacent-tag.rs:5:1
+ --> $DIR/adjacent-tag.rs:4:1
   |
-5 | / #[serde(tag = "conflict", content = "conflict")]
-6 | | enum E {
-7 | |     A,
-8 | |     B,
-9 | | }
+4 | / #[serde(tag = "conflict", content = "conflict")]
+5 | | enum E {
+6 | |     A,
+7 | |     B,
+8 | | }
   | |_^
 
 error: aborting due to previous error

test_suite/tests/ui/conflict/flatten-newtype-struct.rs

@@ -1,5 +1,4 @@
-#[macro_use]
-extern crate serde_derive;
+use serde_derive::Serialize;
 
 use std::collections::HashMap;
 

test_suite/tests/ui/conflict/flatten-newtype-struct.stderr

@@ -1,7 +1,7 @@
 error: #[serde(flatten)] cannot be used on newtype structs
- --> $DIR/flatten-newtype-struct.rs:7:12
+ --> $DIR/flatten-newtype-struct.rs:6:12
   |
-7 | struct Foo(#[serde(flatten)] HashMap<String, String>);
+6 | struct Foo(#[serde(flatten)] HashMap<String, String>);
   |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error

test_suite/tests/ui/conflict/flatten-skip-deserializing.rs

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

test_suite/tests/ui/conflict/flatten-skip-deserializing.stderr

@@ -1,8 +1,8 @@
 error: #[serde(flatten)] can not be combined with #[serde(skip_deserializing)]
- --> $DIR/flatten-skip-deserializing.rs:6:5
+ --> $DIR/flatten-skip-deserializing.rs:5:5
   |
-6 | /     #[serde(flatten, skip_deserializing)]
-7 | |     other: Other,
+5 | /     #[serde(flatten, skip_deserializing)]
+6 | |     other: Other,
   | |________________^
 
 error: aborting due to previous error

test_suite/tests/ui/conflict/flatten-skip-serializing-if.rs

@@ -1,5 +1,4 @@
-#[macro_use]
-extern crate serde_derive;
+use serde_derive::Serialize;
 
 #[derive(Serialize)]
 struct Foo {

test_suite/tests/ui/conflict/flatten-skip-serializing-if.stderr

@@ -1,8 +1,8 @@
 error: #[serde(flatten)] can not be combined with #[serde(skip_serializing_if = "...")]
- --> $DIR/flatten-skip-serializing-if.rs:6:5
+ --> $DIR/flatten-skip-serializing-if.rs:5:5
   |
-6 | /     #[serde(flatten, skip_serializing_if = "Option::is_none")]
-7 | |     other: Option<Other>,
+5 | /     #[serde(flatten, skip_serializing_if = "Option::is_none")]
+6 | |     other: Option<Other>,
   | |________________________^
 
 error: aborting due to previous error

test_suite/tests/ui/conflict/flatten-skip-serializing.rs

@@ -1,5 +1,4 @@
-#[macro_use]
-extern crate serde_derive;
+use serde_derive::Serialize;
 
 #[derive(Serialize)]
 struct Foo {

test_suite/tests/ui/conflict/flatten-skip-serializing.stderr

@@ -1,8 +1,8 @@
 error: #[serde(flatten)] can not be combined with #[serde(skip_serializing)]
- --> $DIR/flatten-skip-serializing.rs:6:5
+ --> $DIR/flatten-skip-serializing.rs:5:5
   |
-6 | /     #[serde(flatten, skip_serializing)]
-7 | |     other: Other,
+5 | /     #[serde(flatten, skip_serializing)]
+6 | |     other: Other,
   | |________________^
 
 error: aborting due to previous error

test_suite/tests/ui/conflict/flatten-tuple-struct.rs

@@ -1,5 +1,4 @@
-#[macro_use]
-extern crate serde_derive;
+use serde_derive::Serialize;
 
 use std::collections::HashMap;
 

test_suite/tests/ui/conflict/flatten-tuple-struct.stderr

@@ -1,7 +1,7 @@
 error: #[serde(flatten)] cannot be used on tuple structs
- --> $DIR/flatten-tuple-struct.rs:7:17
+ --> $DIR/flatten-tuple-struct.rs:6:17
   |
-7 | struct Foo(u32, #[serde(flatten)] HashMap<String, String>);
+6 | struct Foo(u32, #[serde(flatten)] HashMap<String, String>);
   |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error

test_suite/tests/ui/conflict/internal-tag.rs

@@ -1,5 +1,4 @@
-#[macro_use]
-extern crate serde_derive;
+use serde_derive::Serialize;
 
 #[derive(Serialize)]
 #[serde(tag = "conflict")]

test_suite/tests/ui/conflict/internal-tag.stderr

@@ -1,13 +1,13 @@
 error: variant field name `conflict` conflicts with internal tag
-  --> $DIR/internal-tag.rs:5:1
+  --> $DIR/internal-tag.rs:4:1
    |
-5  | / #[serde(tag = "conflict")]
-6  | | enum E {
-7  | |     A {
-8  | |         #[serde(rename = "conflict")]
-9  | |         x: (),
-10 | |     },
-11 | | }
+4  | / #[serde(tag = "conflict")]
+5  | | enum E {
+6  | |     A {
+7  | |         #[serde(rename = "conflict")]
+8  | |         x: (),
+9  | |     },
+10 | | }
    | |_^
 
 error: aborting due to previous error

test_suite/tests/ui/default-attribute/enum.rs

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

test_suite/tests/ui/default-attribute/enum.stderr

@@ -1,7 +1,7 @@
 error: #[serde(default)] can only be used on structs with named fields
- --> $DIR/enum.rs:6:1
+ --> $DIR/enum.rs:5:1
   |
-6 | enum E {
+5 | enum E {
   | ^^^^
 
 error: aborting due to previous error

test_suite/tests/ui/default-attribute/enum_path.rs

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

test_suite/tests/ui/default-attribute/enum_path.stderr

@@ -1,7 +1,7 @@
 error: #[serde(default = "...")] can only be used on structs with named fields
- --> $DIR/enum_path.rs:6:1
+ --> $DIR/enum_path.rs:5:1
   |
-6 | enum E {
+5 | enum E {
   | ^^^^
 
 error: aborting due to previous error

test_suite/tests/ui/default-attribute/nameless_struct_fields.rs

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

test_suite/tests/ui/default-attribute/nameless_struct_fields.stderr

@@ -1,7 +1,7 @@
 error: #[serde(default)] can only be used on structs with named fields
- --> $DIR/nameless_struct_fields.rs:6:9
+ --> $DIR/nameless_struct_fields.rs:5:9
   |
-6 | struct T(u8, u8);
+5 | struct T(u8, u8);
   |         ^^^^^^^^
 
 error: aborting due to previous error

test_suite/tests/ui/default-attribute/nameless_struct_fields_path.rs

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

test_suite/tests/ui/default-attribute/nameless_struct_fields_path.stderr

@@ -1,7 +1,7 @@
 error: #[serde(default = "...")] can only be used on structs with named fields
- --> $DIR/nameless_struct_fields_path.rs:6:9
+ --> $DIR/nameless_struct_fields_path.rs:5:9
   |
-6 | struct T(u8, u8);
+5 | struct T(u8, u8);
   |         ^^^^^^^^
 
 error: aborting due to previous error

test_suite/tests/ui/duplicate-attribute/rename-and-ser.rs

@@ -1,5 +1,4 @@
-#[macro_use]
-extern crate serde_derive;
+use serde_derive::Serialize;
 
 #[derive(Serialize)]
 struct S {

test_suite/tests/ui/duplicate-attribute/rename-and-ser.stderr

@@ -1,7 +1,7 @@
 error: unknown serde field attribute `serialize`
- --> $DIR/rename-and-ser.rs:6:27
+ --> $DIR/rename-and-ser.rs:5:27
   |
-6 |     #[serde(rename = "x", serialize = "y")]
+5 |     #[serde(rename = "x", serialize = "y")]
   |                           ^^^^^^^^^
 
 error: aborting due to previous error

test_suite/tests/ui/duplicate-attribute/rename-rename-de.rs

@@ -1,5 +1,4 @@
-#[macro_use]
-extern crate serde_derive;
+use serde_derive::Serialize;
 
 #[derive(Serialize)]
 struct S {

test_suite/tests/ui/duplicate-attribute/rename-rename-de.stderr

@@ -1,7 +1,7 @@
 error: duplicate serde attribute `rename`
- --> $DIR/rename-rename-de.rs:7:13
+ --> $DIR/rename-rename-de.rs:6:13
   |
-7 |     #[serde(rename(deserialize = "y"))]
+6 |     #[serde(rename(deserialize = "y"))]
   |             ^^^^^^
 
 error: aborting due to previous error

test_suite/tests/ui/duplicate-attribute/rename-ser-rename-ser.rs

@@ -1,5 +1,4 @@
-#[macro_use]
-extern crate serde_derive;
+use serde_derive::Serialize;
 
 #[derive(Serialize)]
 struct S {

test_suite/tests/ui/duplicate-attribute/rename-ser-rename-ser.stderr

@@ -1,7 +1,7 @@
 error: duplicate serde attribute `rename`
- --> $DIR/rename-ser-rename-ser.rs:6:38
+ --> $DIR/rename-ser-rename-ser.rs:5:38
   |
-6 |     #[serde(rename(serialize = "x"), rename(serialize = "y"))]
+5 |     #[serde(rename(serialize = "x"), rename(serialize = "y"))]
   |                                      ^^^^^^
 
 error: aborting due to previous error

test_suite/tests/ui/duplicate-attribute/rename-ser-rename.rs

@@ -1,5 +1,4 @@
-#[macro_use]
-extern crate serde_derive;
+use serde_derive::Serialize;
 
 #[derive(Serialize)]
 struct S {

test_suite/tests/ui/duplicate-attribute/rename-ser-rename.stderr

@@ -1,7 +1,7 @@
 error: duplicate serde attribute `rename`
- --> $DIR/rename-ser-rename.rs:7:13
+ --> $DIR/rename-ser-rename.rs:6:13
   |
-7 |     #[serde(rename = "y")]
+6 |     #[serde(rename = "y")]
   |             ^^^^^^
 
 error: aborting due to previous error

test_suite/tests/ui/duplicate-attribute/rename-ser-ser.rs

@@ -1,5 +1,4 @@
-#[macro_use]
-extern crate serde_derive;
+use serde_derive::Serialize;
 
 #[derive(Serialize)]
 struct S {

test_suite/tests/ui/duplicate-attribute/rename-ser-ser.stderr

@@ -1,7 +1,7 @@
 error: duplicate serde attribute `rename`
- --> $DIR/rename-ser-ser.rs:6:37
+ --> $DIR/rename-ser-ser.rs:5:37
   |
-6 |     #[serde(rename(serialize = "x", serialize = "y"))]
+5 |     #[serde(rename(serialize = "x", serialize = "y"))]
   |                                     ^^^^^^^^^
 
 error: aborting due to previous error

test_suite/tests/ui/duplicate-attribute/two-rename-ser.rs

@@ -1,5 +1,4 @@
-#[macro_use]
-extern crate serde_derive;
+use serde_derive::Serialize;
 
 #[derive(Serialize)]
 struct S {

test_suite/tests/ui/duplicate-attribute/two-rename-ser.stderr

@@ -1,7 +1,7 @@
 error: duplicate serde attribute `rename`
- --> $DIR/two-rename-ser.rs:7:13
+ --> $DIR/two-rename-ser.rs:6:13
   |
-7 |     #[serde(rename(serialize = "y"))]
+6 |     #[serde(rename(serialize = "y"))]
   |             ^^^^^^
 
 error: aborting due to previous error

test_suite/tests/ui/duplicate-attribute/with-and-serialize-with.rs

@@ -1,5 +1,4 @@
-#[macro_use]
-extern crate serde_derive;
+use serde_derive::Serialize;
 
 #[derive(Serialize)]
 struct S {

test_suite/tests/ui/duplicate-attribute/with-and-serialize-with.stderr

@@ -1,7 +1,7 @@
 error: duplicate serde attribute `serialize_with`
- --> $DIR/with-and-serialize-with.rs:6:25
+ --> $DIR/with-and-serialize-with.rs:5:25
   |
-6 |     #[serde(with = "w", serialize_with = "s")]
+5 |     #[serde(with = "w", serialize_with = "s")]
   |                         ^^^^^^^^^^^^^^
 
 error: aborting due to previous error

test_suite/tests/ui/enum-representation/content-no-tag.rs

@@ -1,5 +1,4 @@
-#[macro_use]
-extern crate serde_derive;
+use serde_derive::Serialize;
 
 #[derive(Serialize)]
 #[serde(content = "c")]

test_suite/tests/ui/enum-representation/content-no-tag.stderr

@@ -1,7 +1,7 @@
 error: #[serde(tag = "...", content = "...")] must be used together
- --> $DIR/content-no-tag.rs:5:9
+ --> $DIR/content-no-tag.rs:4:9
   |
-5 | #[serde(content = "c")]
+4 | #[serde(content = "c")]
   |         ^^^^^^^
 
 error: aborting due to previous error

test_suite/tests/ui/enum-representation/internal-tuple-variant.rs

@@ -1,5 +1,4 @@
-#[macro_use]
-extern crate serde_derive;
+use serde_derive::Serialize;
 
 #[derive(Serialize)]
 #[serde(tag = "type")]

test_suite/tests/ui/enum-representation/internal-tuple-variant.stderr

@@ -1,7 +1,7 @@
 error: #[serde(tag = "...")] cannot be used with tuple variants
- --> $DIR/internal-tuple-variant.rs:7:5
+ --> $DIR/internal-tuple-variant.rs:6:5
   |
-7 |     Tuple(u8, u8),
+6 |     Tuple(u8, u8),
   |     ^^^^^^^^^^^^^
 
 error: aborting due to previous error

test_suite/tests/ui/enum-representation/untagged-and-adjacent.rs

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

test_suite/tests/ui/enum-representation/untagged-and-adjacent.stderr

@@ -1,19 +1,19 @@
 error: untagged enum cannot have #[serde(tag = "...", content = "...")]
- --> $DIR/untagged-and-adjacent.rs:5:9
+ --> $DIR/untagged-and-adjacent.rs:4:9
   |
-5 | #[serde(untagged)]
+4 | #[serde(untagged)]
   |         ^^^^^^^^
 
 error: untagged enum cannot have #[serde(tag = "...", content = "...")]
- --> $DIR/untagged-and-adjacent.rs:6:9
+ --> $DIR/untagged-and-adjacent.rs:5:9
   |
-6 | #[serde(tag = "t", content = "c")]
+5 | #[serde(tag = "t", content = "c")]
   |         ^^^
 
 error: untagged enum cannot have #[serde(tag = "...", content = "...")]
- --> $DIR/untagged-and-adjacent.rs:6:20
+ --> $DIR/untagged-and-adjacent.rs:5:20
   |
-6 | #[serde(tag = "t", content = "c")]
+5 | #[serde(tag = "t", content = "c")]
   |                    ^^^^^^^
 
 error: aborting due to 3 previous errors

test_suite/tests/ui/enum-representation/untagged-and-content.rs

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

test_suite/tests/ui/enum-representation/untagged-and-content.stderr

@@ -1,13 +1,13 @@
 error: untagged enum cannot have #[serde(content = "...")]
- --> $DIR/untagged-and-content.rs:5:9
+ --> $DIR/untagged-and-content.rs:4:9
   |
-5 | #[serde(untagged)]
+4 | #[serde(untagged)]
   |         ^^^^^^^^
 
 error: untagged enum cannot have #[serde(content = "...")]
- --> $DIR/untagged-and-content.rs:6:9
+ --> $DIR/untagged-and-content.rs:5:9
   |
-6 | #[serde(content = "c")]
+5 | #[serde(content = "c")]
   |         ^^^^^^^
 
 error: aborting due to 2 previous errors

test_suite/tests/ui/enum-representation/untagged-and-internal.rs

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

test_suite/tests/ui/enum-representation/untagged-and-internal.stderr

@@ -1,13 +1,13 @@
 error: enum cannot be both untagged and internally tagged
- --> $DIR/untagged-and-internal.rs:5:9
+ --> $DIR/untagged-and-internal.rs:4:9
   |
-5 | #[serde(untagged)]
+4 | #[serde(untagged)]
   |         ^^^^^^^^
 
 error: enum cannot be both untagged and internally tagged
- --> $DIR/untagged-and-internal.rs:6:9
+ --> $DIR/untagged-and-internal.rs:5:9
   |
-6 | #[serde(tag = "type")]
+5 | #[serde(tag = "type")]
   |         ^^^
 
 error: aborting due to 2 previous errors

test_suite/tests/ui/enum-representation/untagged-struct.rs

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

test_suite/tests/ui/enum-representation/untagged-struct.stderr

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

test_suite/tests/ui/expected-string/boolean.rs

@@ -1,5 +1,4 @@
-#[macro_use]
-extern crate serde_derive;
+use serde_derive::Serialize;
 
 #[derive(Serialize)]
 struct S {

test_suite/tests/ui/expected-string/boolean.stderr

@@ -1,7 +1,7 @@
 error: expected serde rename attribute to be a string: `rename = "..."`
- --> $DIR/boolean.rs:6:22
+ --> $DIR/boolean.rs:5:22
   |
-6 |     #[serde(rename = true)]
+5 |     #[serde(rename = true)]
   |                      ^^^^
 
 error: aborting due to previous error

test_suite/tests/ui/expected-string/byte_character.rs

@@ -1,5 +1,4 @@
-#[macro_use]
-extern crate serde_derive;
+use serde_derive::Serialize;
 
 #[derive(Serialize)]
 struct S {

test_suite/tests/ui/expected-string/byte_character.stderr

@@ -1,7 +1,7 @@
 error: expected serde rename attribute to be a string: `rename = "..."`
- --> $DIR/byte_character.rs:6:22
+ --> $DIR/byte_character.rs:5:22
   |
-6 |     #[serde(rename = b'a')]
+5 |     #[serde(rename = b'a')]
   |                      ^^^^
 
 error: aborting due to previous error

test_suite/tests/ui/expected-string/byte_string.rs

@@ -1,5 +1,4 @@
-#[macro_use]
-extern crate serde_derive;
+use serde_derive::Serialize;
 
 #[derive(Serialize)]
 struct S {

test_suite/tests/ui/expected-string/byte_string.stderr

@@ -1,7 +1,7 @@
 error: expected serde rename attribute to be a string: `rename = "..."`
- --> $DIR/byte_string.rs:6:22
+ --> $DIR/byte_string.rs:5:22
   |
-6 |     #[serde(rename = b"byte string")]
+5 |     #[serde(rename = b"byte string")]
   |                      ^^^^^^^^^^^^^^
 
 error: aborting due to previous error

test_suite/tests/ui/expected-string/character.rs

@@ -1,5 +1,4 @@
-#[macro_use]
-extern crate serde_derive;
+use serde_derive::Serialize;
 
 #[derive(Serialize)]
 struct S {

test_suite/tests/ui/expected-string/character.stderr

@@ -1,7 +1,7 @@
 error: expected serde rename attribute to be a string: `rename = "..."`
- --> $DIR/character.rs:6:22
+ --> $DIR/character.rs:5:22
   |
-6 |     #[serde(rename = 'a')]
+5 |     #[serde(rename = 'a')]
   |                      ^^^
 
 error: aborting due to previous error

test_suite/tests/ui/expected-string/float.rs

@@ -1,5 +1,4 @@
-#[macro_use]
-extern crate serde_derive;
+use serde_derive::Serialize;
 
 #[derive(Serialize)]
 struct S {

test_suite/tests/ui/expected-string/float.stderr

@@ -1,7 +1,7 @@
 error: expected serde rename attribute to be a string: `rename = "..."`
- --> $DIR/float.rs:6:22
+ --> $DIR/float.rs:5:22
   |
-6 |     #[serde(rename = 3.14)]
+5 |     #[serde(rename = 3.14)]
   |                      ^^^^
 
 error: aborting due to previous error

test_suite/tests/ui/expected-string/integer.rs

@@ -1,5 +1,4 @@
-#[macro_use]
-extern crate serde_derive;
+use serde_derive::Serialize;
 
 #[derive(Serialize)]
 struct S {

test_suite/tests/ui/expected-string/integer.stderr

@@ -1,7 +1,7 @@
 error: expected serde rename attribute to be a string: `rename = "..."`
- --> $DIR/integer.rs:6:22
+ --> $DIR/integer.rs:5:22
   |
-6 |     #[serde(rename = 100)]
+5 |     #[serde(rename = 100)]
   |                      ^^^
 
 error: aborting due to previous error

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

test_suite/tests/ui/malformed/bound.rs

@@ -1,5 +1,4 @@
-#[macro_use]
-extern crate serde_derive;
+use serde_derive::Serialize;
 
 #[derive(Serialize)]
 struct S {

test_suite/tests/ui/malformed/bound.stderr

@@ -1,7 +1,7 @@
 error: malformed bound attribute, expected `bound(serialize = ..., deserialize = ...)`
- --> $DIR/bound.rs:6:19
+ --> $DIR/bound.rs:5:19
   |
-6 |     #[serde(bound(unknown))]
+5 |     #[serde(bound(unknown))]
   |                   ^^^^^^^
 
 error: aborting due to previous error

test_suite/tests/ui/malformed/rename.rs

@@ -1,5 +1,4 @@
-#[macro_use]
-extern crate serde_derive;
+use serde_derive::Serialize;
 
 #[derive(Serialize)]
 struct S {

test_suite/tests/ui/malformed/rename.stderr

@@ -1,7 +1,7 @@
 error: malformed rename attribute, expected `rename(serialize = ..., deserialize = ...)`
- --> $DIR/rename.rs:6:20
+ --> $DIR/rename.rs:5:20
   |
-6 |     #[serde(rename(unknown))]
+5 |     #[serde(rename(unknown))]
   |                    ^^^^^^^
 
 error: aborting due to previous error

test_suite/tests/ui/precondition/deserialize_de_lifetime.rs

@@ -1,5 +1,4 @@
-#[macro_use]
-extern crate serde_derive;
+use serde_derive::Deserialize;
 
 #[derive(Deserialize)]
 struct S<'de> {