From 05ab569a80d2253c9106c424cd601f00615b3de8 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Mon, 31 Dec 2018 21:36:59 -0500 Subject: [PATCH] Update ui tests to 2018 edition --- test_suite/tests/compiletest.rs | 7 ++++++- test_suite/tests/ui/borrow/bad_lifetimes.rs | 3 +-- test_suite/tests/ui/borrow/bad_lifetimes.stderr | 4 ++-- test_suite/tests/ui/borrow/duplicate_lifetime.rs | 3 +-- .../tests/ui/borrow/duplicate_lifetime.stderr | 4 ++-- test_suite/tests/ui/borrow/duplicate_variant.rs | 3 +-- .../tests/ui/borrow/duplicate_variant.stderr | 4 ++-- test_suite/tests/ui/borrow/empty_lifetimes.rs | 3 +-- .../tests/ui/borrow/empty_lifetimes.stderr | 4 ++-- test_suite/tests/ui/borrow/no_lifetimes.rs | 3 +-- test_suite/tests/ui/borrow/no_lifetimes.stderr | 6 +++--- test_suite/tests/ui/borrow/struct_variant.rs | 3 +-- test_suite/tests/ui/borrow/struct_variant.stderr | 10 +++++----- test_suite/tests/ui/borrow/wrong_lifetime.rs | 3 +-- test_suite/tests/ui/borrow/wrong_lifetime.stderr | 6 +++--- test_suite/tests/ui/conflict/adjacent-tag.rs | 3 +-- test_suite/tests/ui/conflict/adjacent-tag.stderr | 12 ++++++------ .../tests/ui/conflict/flatten-newtype-struct.rs | 3 +-- .../ui/conflict/flatten-newtype-struct.stderr | 4 ++-- .../ui/conflict/flatten-skip-deserializing.rs | 3 +-- .../conflict/flatten-skip-deserializing.stderr | 6 +++--- .../ui/conflict/flatten-skip-serializing-if.rs | 3 +-- .../conflict/flatten-skip-serializing-if.stderr | 6 +++--- .../ui/conflict/flatten-skip-serializing.rs | 3 +-- .../ui/conflict/flatten-skip-serializing.stderr | 6 +++--- .../tests/ui/conflict/flatten-tuple-struct.rs | 3 +-- .../ui/conflict/flatten-tuple-struct.stderr | 4 ++-- test_suite/tests/ui/conflict/internal-tag.rs | 3 +-- test_suite/tests/ui/conflict/internal-tag.stderr | 16 ++++++++-------- test_suite/tests/ui/default-attribute/enum.rs | 3 +-- .../tests/ui/default-attribute/enum.stderr | 4 ++-- .../tests/ui/default-attribute/enum_path.rs | 3 +-- .../tests/ui/default-attribute/enum_path.stderr | 4 ++-- .../default-attribute/nameless_struct_fields.rs | 3 +-- .../nameless_struct_fields.stderr | 4 ++-- .../nameless_struct_fields_path.rs | 3 +-- .../nameless_struct_fields_path.stderr | 4 ++-- .../ui/duplicate-attribute/rename-and-ser.rs | 3 +-- .../ui/duplicate-attribute/rename-and-ser.stderr | 4 ++-- .../ui/duplicate-attribute/rename-rename-de.rs | 3 +-- .../duplicate-attribute/rename-rename-de.stderr | 4 ++-- .../duplicate-attribute/rename-ser-rename-ser.rs | 3 +-- .../rename-ser-rename-ser.stderr | 4 ++-- .../ui/duplicate-attribute/rename-ser-rename.rs | 3 +-- .../duplicate-attribute/rename-ser-rename.stderr | 4 ++-- .../ui/duplicate-attribute/rename-ser-ser.rs | 3 +-- .../ui/duplicate-attribute/rename-ser-ser.stderr | 4 ++-- .../ui/duplicate-attribute/two-rename-ser.rs | 3 +-- .../ui/duplicate-attribute/two-rename-ser.stderr | 4 ++-- .../with-and-serialize-with.rs | 3 +-- .../with-and-serialize-with.stderr | 4 ++-- .../ui/enum-representation/content-no-tag.rs | 3 +-- .../ui/enum-representation/content-no-tag.stderr | 4 ++-- .../internal-tuple-variant.rs | 3 +-- .../internal-tuple-variant.stderr | 4 ++-- .../enum-representation/untagged-and-adjacent.rs | 3 +-- .../untagged-and-adjacent.stderr | 12 ++++++------ .../enum-representation/untagged-and-content.rs | 3 +-- .../untagged-and-content.stderr | 8 ++++---- .../enum-representation/untagged-and-internal.rs | 3 +-- .../untagged-and-internal.stderr | 8 ++++---- .../ui/enum-representation/untagged-struct.rs | 3 +-- .../enum-representation/untagged-struct.stderr | 4 ++-- test_suite/tests/ui/expected-string/boolean.rs | 3 +-- .../tests/ui/expected-string/boolean.stderr | 4 ++-- .../tests/ui/expected-string/byte_character.rs | 3 +-- .../ui/expected-string/byte_character.stderr | 4 ++-- .../tests/ui/expected-string/byte_string.rs | 3 +-- .../tests/ui/expected-string/byte_string.stderr | 4 ++-- test_suite/tests/ui/expected-string/character.rs | 3 +-- .../tests/ui/expected-string/character.stderr | 4 ++-- test_suite/tests/ui/expected-string/float.rs | 3 +-- test_suite/tests/ui/expected-string/float.stderr | 4 ++-- test_suite/tests/ui/expected-string/integer.rs | 3 +-- .../tests/ui/expected-string/integer.stderr | 4 ++-- test_suite/tests/ui/identifier/both.rs | 3 +-- test_suite/tests/ui/identifier/both.stderr | 8 ++++---- test_suite/tests/ui/identifier/field_struct.rs | 3 +-- .../tests/ui/identifier/field_struct.stderr | 4 ++-- test_suite/tests/ui/identifier/field_tuple.rs | 3 +-- .../tests/ui/identifier/field_tuple.stderr | 4 ++-- .../tests/ui/identifier/newtype_not_last.rs | 3 +-- .../tests/ui/identifier/newtype_not_last.stderr | 4 ++-- test_suite/tests/ui/identifier/not_unit.rs | 3 +-- test_suite/tests/ui/identifier/not_unit.stderr | 6 +++--- test_suite/tests/ui/identifier/other_not_last.rs | 3 +-- .../tests/ui/identifier/other_not_last.stderr | 6 +++--- test_suite/tests/ui/identifier/other_untagged.rs | 3 +-- .../tests/ui/identifier/other_untagged.stderr | 6 +++--- test_suite/tests/ui/identifier/other_variant.rs | 3 +-- .../tests/ui/identifier/other_variant.stderr | 6 +++--- test_suite/tests/ui/identifier/variant_struct.rs | 3 +-- .../tests/ui/identifier/variant_struct.stderr | 4 ++-- test_suite/tests/ui/identifier/variant_tuple.rs | 3 +-- .../tests/ui/identifier/variant_tuple.stderr | 4 ++-- test_suite/tests/ui/malformed/bound.rs | 3 +-- test_suite/tests/ui/malformed/bound.stderr | 4 ++-- test_suite/tests/ui/malformed/rename.rs | 3 +-- test_suite/tests/ui/malformed/rename.stderr | 4 ++-- .../ui/precondition/deserialize_de_lifetime.rs | 3 +-- .../precondition/deserialize_de_lifetime.stderr | 4 ++-- .../tests/ui/precondition/deserialize_dst.rs | 3 +-- .../tests/ui/precondition/deserialize_dst.stderr | 10 +++++----- .../precondition/serialize_field_identifier.rs | 3 +-- .../serialize_field_identifier.stderr | 12 ++++++------ .../precondition/serialize_variant_identifier.rs | 3 +-- .../serialize_variant_identifier.stderr | 12 ++++++------ test_suite/tests/ui/remote/bad_getter.rs | 3 +-- test_suite/tests/ui/remote/bad_getter.stderr | 4 ++-- test_suite/tests/ui/remote/bad_remote.rs | 3 +-- test_suite/tests/ui/remote/bad_remote.stderr | 4 ++-- test_suite/tests/ui/remote/enum_getter.rs | 3 +-- test_suite/tests/ui/remote/enum_getter.stderr | 16 ++++++++-------- test_suite/tests/ui/remote/missing_field.rs | 3 +-- test_suite/tests/ui/remote/missing_field.stderr | 4 ++-- test_suite/tests/ui/remote/nonremote_getter.rs | 3 +-- .../tests/ui/remote/nonremote_getter.stderr | 10 +++++----- test_suite/tests/ui/remote/unknown_field.rs | 3 +-- test_suite/tests/ui/remote/unknown_field.stderr | 8 ++++---- test_suite/tests/ui/remote/wrong_de.rs | 3 +-- test_suite/tests/ui/remote/wrong_de.stderr | 6 +++--- test_suite/tests/ui/remote/wrong_getter.rs | 3 +-- test_suite/tests/ui/remote/wrong_getter.stderr | 4 ++-- test_suite/tests/ui/remote/wrong_ser.rs | 3 +-- test_suite/tests/ui/remote/wrong_ser.stderr | 14 +++++++------- .../ui/rename/container_unknown_rename_rule.rs | 3 +-- .../rename/container_unknown_rename_rule.stderr | 4 ++-- .../ui/rename/variant_unknown_rename_rule.rs | 3 +-- .../ui/rename/variant_unknown_rename_rule.stderr | 4 ++-- .../internally-tagged-tuple.rs | 3 +-- .../internally-tagged-tuple.stderr | 4 ++-- .../internally-tagged-unit.rs | 3 +-- .../internally-tagged-unit.stderr | 4 ++-- test_suite/tests/ui/transparent/at_most_one.rs | 3 +-- .../tests/ui/transparent/at_most_one.stderr | 12 ++++++------ .../tests/ui/transparent/de_at_least_one.rs | 3 +-- .../tests/ui/transparent/de_at_least_one.stderr | 16 ++++++++-------- test_suite/tests/ui/transparent/enum.rs | 3 +-- test_suite/tests/ui/transparent/enum.stderr | 6 +++--- .../tests/ui/transparent/ser_at_least_one.rs | 3 +-- .../tests/ui/transparent/ser_at_least_one.stderr | 12 ++++++------ test_suite/tests/ui/transparent/unit_struct.rs | 3 +-- .../tests/ui/transparent/unit_struct.stderr | 6 +++--- test_suite/tests/ui/transparent/with_from.rs | 3 +-- test_suite/tests/ui/transparent/with_from.stderr | 10 +++++----- test_suite/tests/ui/transparent/with_into.rs | 3 +-- test_suite/tests/ui/transparent/with_into.stderr | 10 +++++----- test_suite/tests/ui/type-attribute/from.rs | 3 +-- test_suite/tests/ui/type-attribute/from.stderr | 4 ++-- test_suite/tests/ui/type-attribute/into.rs | 3 +-- test_suite/tests/ui/type-attribute/into.stderr | 4 ++-- .../tests/ui/unexpected-literal/container.rs | 3 +-- .../tests/ui/unexpected-literal/container.stderr | 4 ++-- test_suite/tests/ui/unexpected-literal/field.rs | 3 +-- .../tests/ui/unexpected-literal/field.stderr | 4 ++-- .../tests/ui/unexpected-literal/variant.rs | 3 +-- .../tests/ui/unexpected-literal/variant.stderr | 4 ++-- .../tests/ui/unknown-attribute/container.rs | 3 +-- .../tests/ui/unknown-attribute/container.stderr | 4 ++-- test_suite/tests/ui/unknown-attribute/field.rs | 3 +-- .../tests/ui/unknown-attribute/field.stderr | 4 ++-- test_suite/tests/ui/unknown-attribute/variant.rs | 3 +-- .../tests/ui/unknown-attribute/variant.stderr | 4 ++-- test_suite/tests/ui/unsupported/union_de.rs | 3 +-- test_suite/tests/ui/unsupported/union_de.stderr | 10 +++++----- test_suite/tests/ui/unsupported/union_ser.rs | 3 +-- test_suite/tests/ui/unsupported/union_ser.stderr | 10 +++++----- .../ui/with-variant/skip_de_newtype_field.rs | 3 +-- .../ui/with-variant/skip_de_newtype_field.stderr | 6 +++--- .../ui/with-variant/skip_de_struct_field.rs | 3 +-- .../ui/with-variant/skip_de_struct_field.stderr | 14 +++++++------- .../tests/ui/with-variant/skip_de_tuple_field.rs | 3 +-- .../ui/with-variant/skip_de_tuple_field.stderr | 6 +++--- .../ui/with-variant/skip_de_whole_variant.rs | 3 +-- .../ui/with-variant/skip_de_whole_variant.stderr | 8 ++++---- .../ui/with-variant/skip_ser_newtype_field.rs | 3 +-- .../with-variant/skip_ser_newtype_field.stderr | 6 +++--- .../ui/with-variant/skip_ser_newtype_field_if.rs | 3 +-- .../skip_ser_newtype_field_if.stderr | 6 +++--- .../ui/with-variant/skip_ser_struct_field.rs | 3 +-- .../ui/with-variant/skip_ser_struct_field.stderr | 14 +++++++------- .../ui/with-variant/skip_ser_struct_field_if.rs | 3 +-- .../with-variant/skip_ser_struct_field_if.stderr | 14 +++++++------- .../ui/with-variant/skip_ser_tuple_field.rs | 3 +-- .../ui/with-variant/skip_ser_tuple_field.stderr | 6 +++--- .../ui/with-variant/skip_ser_tuple_field_if.rs | 3 +-- .../with-variant/skip_ser_tuple_field_if.stderr | 6 +++--- .../ui/with-variant/skip_ser_whole_variant.rs | 3 +-- .../with-variant/skip_ser_whole_variant.stderr | 8 ++++---- 189 files changed, 401 insertions(+), 490 deletions(-) diff --git a/test_suite/tests/compiletest.rs b/test_suite/tests/compiletest.rs index 9df9c58a..06cec962 100644 --- a/test_suite/tests/compiletest.rs +++ b/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() }; diff --git a/test_suite/tests/ui/borrow/bad_lifetimes.rs b/test_suite/tests/ui/borrow/bad_lifetimes.rs index 1bcc7b05..a76fb339 100644 --- a/test_suite/tests/ui/borrow/bad_lifetimes.rs +++ b/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> { diff --git a/test_suite/tests/ui/borrow/bad_lifetimes.stderr b/test_suite/tests/ui/borrow/bad_lifetimes.stderr index 25b80da3..1adc34a5 100644 --- a/test_suite/tests/ui/borrow/bad_lifetimes.stderr +++ b/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 diff --git a/test_suite/tests/ui/borrow/duplicate_lifetime.rs b/test_suite/tests/ui/borrow/duplicate_lifetime.rs index 447aa48a..3a07ebc6 100644 --- a/test_suite/tests/ui/borrow/duplicate_lifetime.rs +++ b/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> { diff --git a/test_suite/tests/ui/borrow/duplicate_lifetime.stderr b/test_suite/tests/ui/borrow/duplicate_lifetime.stderr index add7082a..57c9690a 100644 --- a/test_suite/tests/ui/borrow/duplicate_lifetime.stderr +++ b/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 diff --git a/test_suite/tests/ui/borrow/duplicate_variant.rs b/test_suite/tests/ui/borrow/duplicate_variant.rs index 349037ba..25cfb4f0 100644 --- a/test_suite/tests/ui/borrow/duplicate_variant.rs +++ b/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); diff --git a/test_suite/tests/ui/borrow/duplicate_variant.stderr b/test_suite/tests/ui/borrow/duplicate_variant.stderr index 35a60b53..7ff995a6 100644 --- a/test_suite/tests/ui/borrow/duplicate_variant.stderr +++ b/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 diff --git a/test_suite/tests/ui/borrow/empty_lifetimes.rs b/test_suite/tests/ui/borrow/empty_lifetimes.rs index 0c2c6ba9..8aab744a 100644 --- a/test_suite/tests/ui/borrow/empty_lifetimes.rs +++ b/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> { diff --git a/test_suite/tests/ui/borrow/empty_lifetimes.stderr b/test_suite/tests/ui/borrow/empty_lifetimes.stderr index c690e2df..01d79b3b 100644 --- a/test_suite/tests/ui/borrow/empty_lifetimes.stderr +++ b/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 diff --git a/test_suite/tests/ui/borrow/no_lifetimes.rs b/test_suite/tests/ui/borrow/no_lifetimes.rs index e78729f3..c6035595 100644 --- a/test_suite/tests/ui/borrow/no_lifetimes.rs +++ b/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 { diff --git a/test_suite/tests/ui/borrow/no_lifetimes.stderr b/test_suite/tests/ui/borrow/no_lifetimes.stderr index 937d5d60..04bcc852 100644 --- a/test_suite/tests/ui/borrow/no_lifetimes.stderr +++ b/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 diff --git a/test_suite/tests/ui/borrow/struct_variant.rs b/test_suite/tests/ui/borrow/struct_variant.rs index 68e10582..ac83cc1c 100644 --- a/test_suite/tests/ui/borrow/struct_variant.rs +++ b/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); diff --git a/test_suite/tests/ui/borrow/struct_variant.stderr b/test_suite/tests/ui/borrow/struct_variant.stderr index 3a2a28cc..758e6343 100644 --- a/test_suite/tests/ui/borrow/struct_variant.stderr +++ b/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 diff --git a/test_suite/tests/ui/borrow/wrong_lifetime.rs b/test_suite/tests/ui/borrow/wrong_lifetime.rs index 8413c06d..eb1fa56b 100644 --- a/test_suite/tests/ui/borrow/wrong_lifetime.rs +++ b/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> { diff --git a/test_suite/tests/ui/borrow/wrong_lifetime.stderr b/test_suite/tests/ui/borrow/wrong_lifetime.stderr index d69cef4b..35659552 100644 --- a/test_suite/tests/ui/borrow/wrong_lifetime.stderr +++ b/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 diff --git a/test_suite/tests/ui/conflict/adjacent-tag.rs b/test_suite/tests/ui/conflict/adjacent-tag.rs index 72e0886f..f192830f 100644 --- a/test_suite/tests/ui/conflict/adjacent-tag.rs +++ b/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")] diff --git a/test_suite/tests/ui/conflict/adjacent-tag.stderr b/test_suite/tests/ui/conflict/adjacent-tag.stderr index 2576110e..6045f5f5 100644 --- a/test_suite/tests/ui/conflict/adjacent-tag.stderr +++ b/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 diff --git a/test_suite/tests/ui/conflict/flatten-newtype-struct.rs b/test_suite/tests/ui/conflict/flatten-newtype-struct.rs index 1a6da0ee..541cbc5d 100644 --- a/test_suite/tests/ui/conflict/flatten-newtype-struct.rs +++ b/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; diff --git a/test_suite/tests/ui/conflict/flatten-newtype-struct.stderr b/test_suite/tests/ui/conflict/flatten-newtype-struct.stderr index 9b78bc62..86e9501a 100644 --- a/test_suite/tests/ui/conflict/flatten-newtype-struct.stderr +++ b/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); +6 | struct Foo(#[serde(flatten)] HashMap); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/conflict/flatten-skip-deserializing.rs b/test_suite/tests/ui/conflict/flatten-skip-deserializing.rs index 82999094..dea009a8 100644 --- a/test_suite/tests/ui/conflict/flatten-skip-deserializing.rs +++ b/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 { diff --git a/test_suite/tests/ui/conflict/flatten-skip-deserializing.stderr b/test_suite/tests/ui/conflict/flatten-skip-deserializing.stderr index 875c7cb5..f9edfde5 100644 --- a/test_suite/tests/ui/conflict/flatten-skip-deserializing.stderr +++ b/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 diff --git a/test_suite/tests/ui/conflict/flatten-skip-serializing-if.rs b/test_suite/tests/ui/conflict/flatten-skip-serializing-if.rs index e87b233d..3973654d 100644 --- a/test_suite/tests/ui/conflict/flatten-skip-serializing-if.rs +++ b/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 { diff --git a/test_suite/tests/ui/conflict/flatten-skip-serializing-if.stderr b/test_suite/tests/ui/conflict/flatten-skip-serializing-if.stderr index 7ce4bbf2..bf608f3a 100644 --- a/test_suite/tests/ui/conflict/flatten-skip-serializing-if.stderr +++ b/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, +5 | / #[serde(flatten, skip_serializing_if = "Option::is_none")] +6 | | other: Option, | |________________________^ error: aborting due to previous error diff --git a/test_suite/tests/ui/conflict/flatten-skip-serializing.rs b/test_suite/tests/ui/conflict/flatten-skip-serializing.rs index 997049c8..6983c16a 100644 --- a/test_suite/tests/ui/conflict/flatten-skip-serializing.rs +++ b/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 { diff --git a/test_suite/tests/ui/conflict/flatten-skip-serializing.stderr b/test_suite/tests/ui/conflict/flatten-skip-serializing.stderr index 143466e6..cdce5d48 100644 --- a/test_suite/tests/ui/conflict/flatten-skip-serializing.stderr +++ b/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 diff --git a/test_suite/tests/ui/conflict/flatten-tuple-struct.rs b/test_suite/tests/ui/conflict/flatten-tuple-struct.rs index 32a37b90..5d69060d 100644 --- a/test_suite/tests/ui/conflict/flatten-tuple-struct.rs +++ b/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; diff --git a/test_suite/tests/ui/conflict/flatten-tuple-struct.stderr b/test_suite/tests/ui/conflict/flatten-tuple-struct.stderr index 33f5ad48..ecdb987c 100644 --- a/test_suite/tests/ui/conflict/flatten-tuple-struct.stderr +++ b/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); +6 | struct Foo(u32, #[serde(flatten)] HashMap); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/conflict/internal-tag.rs b/test_suite/tests/ui/conflict/internal-tag.rs index 9beda346..48d2c7dd 100644 --- a/test_suite/tests/ui/conflict/internal-tag.rs +++ b/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")] diff --git a/test_suite/tests/ui/conflict/internal-tag.stderr b/test_suite/tests/ui/conflict/internal-tag.stderr index dd535ef7..d98c3874 100644 --- a/test_suite/tests/ui/conflict/internal-tag.stderr +++ b/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 diff --git a/test_suite/tests/ui/default-attribute/enum.rs b/test_suite/tests/ui/default-attribute/enum.rs index f747e94c..8ecb398e 100644 --- a/test_suite/tests/ui/default-attribute/enum.rs +++ b/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)] diff --git a/test_suite/tests/ui/default-attribute/enum.stderr b/test_suite/tests/ui/default-attribute/enum.stderr index 72a8d9d9..9f2a2618 100644 --- a/test_suite/tests/ui/default-attribute/enum.stderr +++ b/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 diff --git a/test_suite/tests/ui/default-attribute/enum_path.rs b/test_suite/tests/ui/default-attribute/enum_path.rs index 9a261b16..ef43372d 100644 --- a/test_suite/tests/ui/default-attribute/enum_path.rs +++ b/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")] diff --git a/test_suite/tests/ui/default-attribute/enum_path.stderr b/test_suite/tests/ui/default-attribute/enum_path.stderr index 61e36f68..9a9a8ecb 100644 --- a/test_suite/tests/ui/default-attribute/enum_path.stderr +++ b/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 diff --git a/test_suite/tests/ui/default-attribute/nameless_struct_fields.rs b/test_suite/tests/ui/default-attribute/nameless_struct_fields.rs index 8e33c919..fe21e0d4 100644 --- a/test_suite/tests/ui/default-attribute/nameless_struct_fields.rs +++ b/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)] diff --git a/test_suite/tests/ui/default-attribute/nameless_struct_fields.stderr b/test_suite/tests/ui/default-attribute/nameless_struct_fields.stderr index 52984f83..3e8d0708 100644 --- a/test_suite/tests/ui/default-attribute/nameless_struct_fields.stderr +++ b/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 diff --git a/test_suite/tests/ui/default-attribute/nameless_struct_fields_path.rs b/test_suite/tests/ui/default-attribute/nameless_struct_fields_path.rs index 3dd82f71..f7859ce5 100644 --- a/test_suite/tests/ui/default-attribute/nameless_struct_fields_path.rs +++ b/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")] diff --git a/test_suite/tests/ui/default-attribute/nameless_struct_fields_path.stderr b/test_suite/tests/ui/default-attribute/nameless_struct_fields_path.stderr index 301e8640..9197807b 100644 --- a/test_suite/tests/ui/default-attribute/nameless_struct_fields_path.stderr +++ b/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 diff --git a/test_suite/tests/ui/duplicate-attribute/rename-and-ser.rs b/test_suite/tests/ui/duplicate-attribute/rename-and-ser.rs index a6fb30af..05082363 100644 --- a/test_suite/tests/ui/duplicate-attribute/rename-and-ser.rs +++ b/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 { diff --git a/test_suite/tests/ui/duplicate-attribute/rename-and-ser.stderr b/test_suite/tests/ui/duplicate-attribute/rename-and-ser.stderr index 46bf2036..74f730fd 100644 --- a/test_suite/tests/ui/duplicate-attribute/rename-and-ser.stderr +++ b/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 diff --git a/test_suite/tests/ui/duplicate-attribute/rename-rename-de.rs b/test_suite/tests/ui/duplicate-attribute/rename-rename-de.rs index 9c8d5dd7..6aeb3301 100644 --- a/test_suite/tests/ui/duplicate-attribute/rename-rename-de.rs +++ b/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 { diff --git a/test_suite/tests/ui/duplicate-attribute/rename-rename-de.stderr b/test_suite/tests/ui/duplicate-attribute/rename-rename-de.stderr index 9c425d82..0824272c 100644 --- a/test_suite/tests/ui/duplicate-attribute/rename-rename-de.stderr +++ b/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 diff --git a/test_suite/tests/ui/duplicate-attribute/rename-ser-rename-ser.rs b/test_suite/tests/ui/duplicate-attribute/rename-ser-rename-ser.rs index 1512db51..77c61014 100644 --- a/test_suite/tests/ui/duplicate-attribute/rename-ser-rename-ser.rs +++ b/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 { diff --git a/test_suite/tests/ui/duplicate-attribute/rename-ser-rename-ser.stderr b/test_suite/tests/ui/duplicate-attribute/rename-ser-rename-ser.stderr index e0f48d03..04e67b13 100644 --- a/test_suite/tests/ui/duplicate-attribute/rename-ser-rename-ser.stderr +++ b/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 diff --git a/test_suite/tests/ui/duplicate-attribute/rename-ser-rename.rs b/test_suite/tests/ui/duplicate-attribute/rename-ser-rename.rs index 8e6c0255..061b4eb8 100644 --- a/test_suite/tests/ui/duplicate-attribute/rename-ser-rename.rs +++ b/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 { diff --git a/test_suite/tests/ui/duplicate-attribute/rename-ser-rename.stderr b/test_suite/tests/ui/duplicate-attribute/rename-ser-rename.stderr index f4621648..d9cb3650 100644 --- a/test_suite/tests/ui/duplicate-attribute/rename-ser-rename.stderr +++ b/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 diff --git a/test_suite/tests/ui/duplicate-attribute/rename-ser-ser.rs b/test_suite/tests/ui/duplicate-attribute/rename-ser-ser.rs index 0bc2a956..742f8888 100644 --- a/test_suite/tests/ui/duplicate-attribute/rename-ser-ser.rs +++ b/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 { diff --git a/test_suite/tests/ui/duplicate-attribute/rename-ser-ser.stderr b/test_suite/tests/ui/duplicate-attribute/rename-ser-ser.stderr index 89a0810b..c5526c71 100644 --- a/test_suite/tests/ui/duplicate-attribute/rename-ser-ser.stderr +++ b/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 diff --git a/test_suite/tests/ui/duplicate-attribute/two-rename-ser.rs b/test_suite/tests/ui/duplicate-attribute/two-rename-ser.rs index f03b393b..bade236f 100644 --- a/test_suite/tests/ui/duplicate-attribute/two-rename-ser.rs +++ b/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 { diff --git a/test_suite/tests/ui/duplicate-attribute/two-rename-ser.stderr b/test_suite/tests/ui/duplicate-attribute/two-rename-ser.stderr index a8f5fabc..3934ac9d 100644 --- a/test_suite/tests/ui/duplicate-attribute/two-rename-ser.stderr +++ b/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 diff --git a/test_suite/tests/ui/duplicate-attribute/with-and-serialize-with.rs b/test_suite/tests/ui/duplicate-attribute/with-and-serialize-with.rs index 0879e403..5f7b8412 100644 --- a/test_suite/tests/ui/duplicate-attribute/with-and-serialize-with.rs +++ b/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 { diff --git a/test_suite/tests/ui/duplicate-attribute/with-and-serialize-with.stderr b/test_suite/tests/ui/duplicate-attribute/with-and-serialize-with.stderr index 153cd318..27e3a0bf 100644 --- a/test_suite/tests/ui/duplicate-attribute/with-and-serialize-with.stderr +++ b/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 diff --git a/test_suite/tests/ui/enum-representation/content-no-tag.rs b/test_suite/tests/ui/enum-representation/content-no-tag.rs index 0506aef4..7e987128 100644 --- a/test_suite/tests/ui/enum-representation/content-no-tag.rs +++ b/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")] diff --git a/test_suite/tests/ui/enum-representation/content-no-tag.stderr b/test_suite/tests/ui/enum-representation/content-no-tag.stderr index 0f05eb9f..ad7186e5 100644 --- a/test_suite/tests/ui/enum-representation/content-no-tag.stderr +++ b/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 diff --git a/test_suite/tests/ui/enum-representation/internal-tuple-variant.rs b/test_suite/tests/ui/enum-representation/internal-tuple-variant.rs index 3cfe715b..f100fb53 100644 --- a/test_suite/tests/ui/enum-representation/internal-tuple-variant.rs +++ b/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")] diff --git a/test_suite/tests/ui/enum-representation/internal-tuple-variant.stderr b/test_suite/tests/ui/enum-representation/internal-tuple-variant.stderr index b6c823b1..8d133689 100644 --- a/test_suite/tests/ui/enum-representation/internal-tuple-variant.stderr +++ b/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 diff --git a/test_suite/tests/ui/enum-representation/untagged-and-adjacent.rs b/test_suite/tests/ui/enum-representation/untagged-and-adjacent.rs index 3254735d..b1e6d7a7 100644 --- a/test_suite/tests/ui/enum-representation/untagged-and-adjacent.rs +++ b/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)] diff --git a/test_suite/tests/ui/enum-representation/untagged-and-adjacent.stderr b/test_suite/tests/ui/enum-representation/untagged-and-adjacent.stderr index 8c3d93f9..367a55fe 100644 --- a/test_suite/tests/ui/enum-representation/untagged-and-adjacent.stderr +++ b/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 diff --git a/test_suite/tests/ui/enum-representation/untagged-and-content.rs b/test_suite/tests/ui/enum-representation/untagged-and-content.rs index 410a84be..32516303 100644 --- a/test_suite/tests/ui/enum-representation/untagged-and-content.rs +++ b/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)] diff --git a/test_suite/tests/ui/enum-representation/untagged-and-content.stderr b/test_suite/tests/ui/enum-representation/untagged-and-content.stderr index a2b0fc0b..847579ac 100644 --- a/test_suite/tests/ui/enum-representation/untagged-and-content.stderr +++ b/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 diff --git a/test_suite/tests/ui/enum-representation/untagged-and-internal.rs b/test_suite/tests/ui/enum-representation/untagged-and-internal.rs index e3c6ec2a..3a45a9da 100644 --- a/test_suite/tests/ui/enum-representation/untagged-and-internal.rs +++ b/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)] diff --git a/test_suite/tests/ui/enum-representation/untagged-and-internal.stderr b/test_suite/tests/ui/enum-representation/untagged-and-internal.stderr index 8091922b..2bb43502 100644 --- a/test_suite/tests/ui/enum-representation/untagged-and-internal.stderr +++ b/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 diff --git a/test_suite/tests/ui/enum-representation/untagged-struct.rs b/test_suite/tests/ui/enum-representation/untagged-struct.rs index 54be0ecc..a8cf3996 100644 --- a/test_suite/tests/ui/enum-representation/untagged-struct.rs +++ b/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)] diff --git a/test_suite/tests/ui/enum-representation/untagged-struct.stderr b/test_suite/tests/ui/enum-representation/untagged-struct.stderr index 4b6051c1..49f77bc6 100644 --- a/test_suite/tests/ui/enum-representation/untagged-struct.stderr +++ b/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 diff --git a/test_suite/tests/ui/expected-string/boolean.rs b/test_suite/tests/ui/expected-string/boolean.rs index 68744bf3..d3fc0657 100644 --- a/test_suite/tests/ui/expected-string/boolean.rs +++ b/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 { diff --git a/test_suite/tests/ui/expected-string/boolean.stderr b/test_suite/tests/ui/expected-string/boolean.stderr index 08ec5caa..4396e4b1 100644 --- a/test_suite/tests/ui/expected-string/boolean.stderr +++ b/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 diff --git a/test_suite/tests/ui/expected-string/byte_character.rs b/test_suite/tests/ui/expected-string/byte_character.rs index 69c3e8e4..4b968170 100644 --- a/test_suite/tests/ui/expected-string/byte_character.rs +++ b/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 { diff --git a/test_suite/tests/ui/expected-string/byte_character.stderr b/test_suite/tests/ui/expected-string/byte_character.stderr index 7e271f9a..3ebf6f27 100644 --- a/test_suite/tests/ui/expected-string/byte_character.stderr +++ b/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 diff --git a/test_suite/tests/ui/expected-string/byte_string.rs b/test_suite/tests/ui/expected-string/byte_string.rs index 6fa365bf..2927aad8 100644 --- a/test_suite/tests/ui/expected-string/byte_string.rs +++ b/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 { diff --git a/test_suite/tests/ui/expected-string/byte_string.stderr b/test_suite/tests/ui/expected-string/byte_string.stderr index 44e9dd7f..7b5be122 100644 --- a/test_suite/tests/ui/expected-string/byte_string.stderr +++ b/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 diff --git a/test_suite/tests/ui/expected-string/character.rs b/test_suite/tests/ui/expected-string/character.rs index 4955a890..55a5b80c 100644 --- a/test_suite/tests/ui/expected-string/character.rs +++ b/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 { diff --git a/test_suite/tests/ui/expected-string/character.stderr b/test_suite/tests/ui/expected-string/character.stderr index dca61053..ff684911 100644 --- a/test_suite/tests/ui/expected-string/character.stderr +++ b/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 diff --git a/test_suite/tests/ui/expected-string/float.rs b/test_suite/tests/ui/expected-string/float.rs index c7d895e5..004bc341 100644 --- a/test_suite/tests/ui/expected-string/float.rs +++ b/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 { diff --git a/test_suite/tests/ui/expected-string/float.stderr b/test_suite/tests/ui/expected-string/float.stderr index a89eb3d3..a8106cb6 100644 --- a/test_suite/tests/ui/expected-string/float.stderr +++ b/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 diff --git a/test_suite/tests/ui/expected-string/integer.rs b/test_suite/tests/ui/expected-string/integer.rs index 664483b4..ecbf7ad1 100644 --- a/test_suite/tests/ui/expected-string/integer.rs +++ b/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 { diff --git a/test_suite/tests/ui/expected-string/integer.stderr b/test_suite/tests/ui/expected-string/integer.stderr index 2df6df0d..cce9ebae 100644 --- a/test_suite/tests/ui/expected-string/integer.stderr +++ b/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 diff --git a/test_suite/tests/ui/identifier/both.rs b/test_suite/tests/ui/identifier/both.rs index 2b91c64a..a8b9da6d 100644 --- a/test_suite/tests/ui/identifier/both.rs +++ b/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)] diff --git a/test_suite/tests/ui/identifier/both.stderr b/test_suite/tests/ui/identifier/both.stderr index 4a471c7e..c2674175 100644 --- a/test_suite/tests/ui/identifier/both.stderr +++ b/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 diff --git a/test_suite/tests/ui/identifier/field_struct.rs b/test_suite/tests/ui/identifier/field_struct.rs index 5526d6b0..bf0d4988 100644 --- a/test_suite/tests/ui/identifier/field_struct.rs +++ b/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)] diff --git a/test_suite/tests/ui/identifier/field_struct.stderr b/test_suite/tests/ui/identifier/field_struct.stderr index a5c2c6cb..49013343 100644 --- a/test_suite/tests/ui/identifier/field_struct.stderr +++ b/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 diff --git a/test_suite/tests/ui/identifier/field_tuple.rs b/test_suite/tests/ui/identifier/field_tuple.rs index beb5199e..2f91b52e 100644 --- a/test_suite/tests/ui/identifier/field_tuple.rs +++ b/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)] diff --git a/test_suite/tests/ui/identifier/field_tuple.stderr b/test_suite/tests/ui/identifier/field_tuple.stderr index 0f36ce7e..2710d0b8 100644 --- a/test_suite/tests/ui/identifier/field_tuple.stderr +++ b/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 diff --git a/test_suite/tests/ui/identifier/newtype_not_last.rs b/test_suite/tests/ui/identifier/newtype_not_last.rs index 307e181c..f5aa3312 100644 --- a/test_suite/tests/ui/identifier/newtype_not_last.rs +++ b/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)] diff --git a/test_suite/tests/ui/identifier/newtype_not_last.stderr b/test_suite/tests/ui/identifier/newtype_not_last.stderr index d095ab82..3a30c9a9 100644 --- a/test_suite/tests/ui/identifier/newtype_not_last.stderr +++ b/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 diff --git a/test_suite/tests/ui/identifier/not_unit.rs b/test_suite/tests/ui/identifier/not_unit.rs index 2b831dec..16bdbb8e 100644 --- a/test_suite/tests/ui/identifier/not_unit.rs +++ b/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)] diff --git a/test_suite/tests/ui/identifier/not_unit.stderr b/test_suite/tests/ui/identifier/not_unit.stderr index 5ee7dbc6..26b7e0a7 100644 --- a/test_suite/tests/ui/identifier/not_unit.stderr +++ b/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 diff --git a/test_suite/tests/ui/identifier/other_not_last.rs b/test_suite/tests/ui/identifier/other_not_last.rs index d264a1df..7902f1c5 100644 --- a/test_suite/tests/ui/identifier/other_not_last.rs +++ b/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)] diff --git a/test_suite/tests/ui/identifier/other_not_last.stderr b/test_suite/tests/ui/identifier/other_not_last.stderr index ba83a68b..a470f48f 100644 --- a/test_suite/tests/ui/identifier/other_not_last.stderr +++ b/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 diff --git a/test_suite/tests/ui/identifier/other_untagged.rs b/test_suite/tests/ui/identifier/other_untagged.rs index 15d12b6e..ab43c705 100644 --- a/test_suite/tests/ui/identifier/other_untagged.rs +++ b/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)] diff --git a/test_suite/tests/ui/identifier/other_untagged.stderr b/test_suite/tests/ui/identifier/other_untagged.stderr index 5b562cbd..f6068ade 100644 --- a/test_suite/tests/ui/identifier/other_untagged.stderr +++ b/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 diff --git a/test_suite/tests/ui/identifier/other_variant.rs b/test_suite/tests/ui/identifier/other_variant.rs index cbfe9f3e..573674de 100644 --- a/test_suite/tests/ui/identifier/other_variant.rs +++ b/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)] diff --git a/test_suite/tests/ui/identifier/other_variant.stderr b/test_suite/tests/ui/identifier/other_variant.stderr index 7fb851c8..900a71a0 100644 --- a/test_suite/tests/ui/identifier/other_variant.stderr +++ b/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 diff --git a/test_suite/tests/ui/identifier/variant_struct.rs b/test_suite/tests/ui/identifier/variant_struct.rs index 4becbc42..7efb0a9c 100644 --- a/test_suite/tests/ui/identifier/variant_struct.rs +++ b/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)] diff --git a/test_suite/tests/ui/identifier/variant_struct.stderr b/test_suite/tests/ui/identifier/variant_struct.stderr index e81cf133..d4760ddb 100644 --- a/test_suite/tests/ui/identifier/variant_struct.stderr +++ b/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 diff --git a/test_suite/tests/ui/identifier/variant_tuple.rs b/test_suite/tests/ui/identifier/variant_tuple.rs index 6567296b..3ac8f0ac 100644 --- a/test_suite/tests/ui/identifier/variant_tuple.rs +++ b/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)] diff --git a/test_suite/tests/ui/identifier/variant_tuple.stderr b/test_suite/tests/ui/identifier/variant_tuple.stderr index b90aed1b..ba25c76f 100644 --- a/test_suite/tests/ui/identifier/variant_tuple.stderr +++ b/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 diff --git a/test_suite/tests/ui/malformed/bound.rs b/test_suite/tests/ui/malformed/bound.rs index b6816b38..dedf721e 100644 --- a/test_suite/tests/ui/malformed/bound.rs +++ b/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 { diff --git a/test_suite/tests/ui/malformed/bound.stderr b/test_suite/tests/ui/malformed/bound.stderr index 0fb80c8b..6f65801c 100644 --- a/test_suite/tests/ui/malformed/bound.stderr +++ b/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 diff --git a/test_suite/tests/ui/malformed/rename.rs b/test_suite/tests/ui/malformed/rename.rs index 32d86217..6ebccd8e 100644 --- a/test_suite/tests/ui/malformed/rename.rs +++ b/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 { diff --git a/test_suite/tests/ui/malformed/rename.stderr b/test_suite/tests/ui/malformed/rename.stderr index 58765222..104bfba5 100644 --- a/test_suite/tests/ui/malformed/rename.stderr +++ b/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 diff --git a/test_suite/tests/ui/precondition/deserialize_de_lifetime.rs b/test_suite/tests/ui/precondition/deserialize_de_lifetime.rs index 5dfe6245..f3ae1f3b 100644 --- a/test_suite/tests/ui/precondition/deserialize_de_lifetime.rs +++ b/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> { diff --git a/test_suite/tests/ui/precondition/deserialize_de_lifetime.stderr b/test_suite/tests/ui/precondition/deserialize_de_lifetime.stderr index db2d83af..7cb0c1b8 100644 --- a/test_suite/tests/ui/precondition/deserialize_de_lifetime.stderr +++ b/test_suite/tests/ui/precondition/deserialize_de_lifetime.stderr @@ -1,7 +1,7 @@ error: cannot deserialize when there is a lifetime parameter called 'de - --> $DIR/deserialize_de_lifetime.rs:5:10 + --> $DIR/deserialize_de_lifetime.rs:4:10 | -5 | struct S<'de> { +4 | struct S<'de> { | ^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/precondition/deserialize_dst.rs b/test_suite/tests/ui/precondition/deserialize_dst.rs index 4f62a04e..dbba6e2b 100644 --- a/test_suite/tests/ui/precondition/deserialize_dst.rs +++ b/test_suite/tests/ui/precondition/deserialize_dst.rs @@ -1,5 +1,4 @@ -#[macro_use] -extern crate serde_derive; +use serde_derive::Deserialize; #[derive(Deserialize)] struct S { diff --git a/test_suite/tests/ui/precondition/deserialize_dst.stderr b/test_suite/tests/ui/precondition/deserialize_dst.stderr index 9efab0e1..f037310b 100644 --- a/test_suite/tests/ui/precondition/deserialize_dst.stderr +++ b/test_suite/tests/ui/precondition/deserialize_dst.stderr @@ -1,10 +1,10 @@ error: cannot deserialize a dynamically sized struct - --> $DIR/deserialize_dst.rs:5:1 + --> $DIR/deserialize_dst.rs:4:1 | -5 | / struct S { -6 | | string: String, -7 | | slice: [u8], -8 | | } +4 | / struct S { +5 | | string: String, +6 | | slice: [u8], +7 | | } | |_^ error: aborting due to previous error diff --git a/test_suite/tests/ui/precondition/serialize_field_identifier.rs b/test_suite/tests/ui/precondition/serialize_field_identifier.rs index dc6f761e..59cbb8d9 100644 --- a/test_suite/tests/ui/precondition/serialize_field_identifier.rs +++ b/test_suite/tests/ui/precondition/serialize_field_identifier.rs @@ -1,5 +1,4 @@ -#[macro_use] -extern crate serde_derive; +use serde_derive::Serialize; #[derive(Serialize)] #[serde(field_identifier)] diff --git a/test_suite/tests/ui/precondition/serialize_field_identifier.stderr b/test_suite/tests/ui/precondition/serialize_field_identifier.stderr index 50726c34..bd102f36 100644 --- a/test_suite/tests/ui/precondition/serialize_field_identifier.stderr +++ b/test_suite/tests/ui/precondition/serialize_field_identifier.stderr @@ -1,11 +1,11 @@ error: field identifiers cannot be serialized - --> $DIR/serialize_field_identifier.rs:5:1 + --> $DIR/serialize_field_identifier.rs:4:1 | -5 | / #[serde(field_identifier)] -6 | | enum F { -7 | | A, -8 | | B, -9 | | } +4 | / #[serde(field_identifier)] +5 | | enum F { +6 | | A, +7 | | B, +8 | | } | |_^ error: aborting due to previous error diff --git a/test_suite/tests/ui/precondition/serialize_variant_identifier.rs b/test_suite/tests/ui/precondition/serialize_variant_identifier.rs index 7abfc209..acefdcae 100644 --- a/test_suite/tests/ui/precondition/serialize_variant_identifier.rs +++ b/test_suite/tests/ui/precondition/serialize_variant_identifier.rs @@ -1,5 +1,4 @@ -#[macro_use] -extern crate serde_derive; +use serde_derive::Serialize; #[derive(Serialize)] #[serde(variant_identifier)] diff --git a/test_suite/tests/ui/precondition/serialize_variant_identifier.stderr b/test_suite/tests/ui/precondition/serialize_variant_identifier.stderr index d5ef4650..244a4f2c 100644 --- a/test_suite/tests/ui/precondition/serialize_variant_identifier.stderr +++ b/test_suite/tests/ui/precondition/serialize_variant_identifier.stderr @@ -1,11 +1,11 @@ error: variant identifiers cannot be serialized - --> $DIR/serialize_variant_identifier.rs:5:1 + --> $DIR/serialize_variant_identifier.rs:4:1 | -5 | / #[serde(variant_identifier)] -6 | | enum F { -7 | | A, -8 | | B, -9 | | } +4 | / #[serde(variant_identifier)] +5 | | enum F { +6 | | A, +7 | | B, +8 | | } | |_^ error: aborting due to previous error diff --git a/test_suite/tests/ui/remote/bad_getter.rs b/test_suite/tests/ui/remote/bad_getter.rs index 9549394c..a30d6a89 100644 --- a/test_suite/tests/ui/remote/bad_getter.rs +++ b/test_suite/tests/ui/remote/bad_getter.rs @@ -1,5 +1,4 @@ -#[macro_use] -extern crate serde_derive; +use serde_derive::Serialize; mod remote { pub struct S { diff --git a/test_suite/tests/ui/remote/bad_getter.stderr b/test_suite/tests/ui/remote/bad_getter.stderr index 9971860f..955a6caf 100644 --- a/test_suite/tests/ui/remote/bad_getter.stderr +++ b/test_suite/tests/ui/remote/bad_getter.stderr @@ -1,7 +1,7 @@ error: failed to parse path: "~~~" - --> $DIR/bad_getter.rs:13:22 + --> $DIR/bad_getter.rs:12:22 | -13 | #[serde(getter = "~~~")] +12 | #[serde(getter = "~~~")] | ^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/remote/bad_remote.rs b/test_suite/tests/ui/remote/bad_remote.rs index b186cc64..f4d60df4 100644 --- a/test_suite/tests/ui/remote/bad_remote.rs +++ b/test_suite/tests/ui/remote/bad_remote.rs @@ -1,5 +1,4 @@ -#[macro_use] -extern crate serde_derive; +use serde_derive::Serialize; mod remote { pub struct S { diff --git a/test_suite/tests/ui/remote/bad_remote.stderr b/test_suite/tests/ui/remote/bad_remote.stderr index ec87ed41..e275d14a 100644 --- a/test_suite/tests/ui/remote/bad_remote.stderr +++ b/test_suite/tests/ui/remote/bad_remote.stderr @@ -1,7 +1,7 @@ error: failed to parse path: "~~~" - --> $DIR/bad_remote.rs:11:18 + --> $DIR/bad_remote.rs:10:18 | -11 | #[serde(remote = "~~~")] +10 | #[serde(remote = "~~~")] | ^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/remote/enum_getter.rs b/test_suite/tests/ui/remote/enum_getter.rs index 322ffdb4..6612f23a 100644 --- a/test_suite/tests/ui/remote/enum_getter.rs +++ b/test_suite/tests/ui/remote/enum_getter.rs @@ -1,5 +1,4 @@ -#[macro_use] -extern crate serde_derive; +use serde_derive::Serialize; mod remote { pub enum E { diff --git a/test_suite/tests/ui/remote/enum_getter.stderr b/test_suite/tests/ui/remote/enum_getter.stderr index cb22c709..14ffc9a4 100644 --- a/test_suite/tests/ui/remote/enum_getter.stderr +++ b/test_suite/tests/ui/remote/enum_getter.stderr @@ -1,13 +1,13 @@ error: #[serde(getter = "...")] is not allowed in an enum - --> $DIR/enum_getter.rs:11:1 + --> $DIR/enum_getter.rs:10:1 | -11 | / #[serde(remote = "remote::E")] -12 | | pub enum E { -13 | | A { -14 | | #[serde(getter = "get_a")] -15 | | a: u8, -16 | | }, -17 | | } +10 | / #[serde(remote = "remote::E")] +11 | | pub enum E { +12 | | A { +13 | | #[serde(getter = "get_a")] +14 | | a: u8, +15 | | }, +16 | | } | |_^ error: aborting due to previous error diff --git a/test_suite/tests/ui/remote/missing_field.rs b/test_suite/tests/ui/remote/missing_field.rs index dba77f21..e3f3ec8f 100644 --- a/test_suite/tests/ui/remote/missing_field.rs +++ b/test_suite/tests/ui/remote/missing_field.rs @@ -1,5 +1,4 @@ -#[macro_use] -extern crate serde_derive; +use serde_derive::{Serialize, Deserialize}; mod remote { pub struct S { diff --git a/test_suite/tests/ui/remote/missing_field.stderr b/test_suite/tests/ui/remote/missing_field.stderr index 8f175836..d79fb380 100644 --- a/test_suite/tests/ui/remote/missing_field.stderr +++ b/test_suite/tests/ui/remote/missing_field.stderr @@ -1,7 +1,7 @@ error[E0063]: missing field `b` in initializer of `remote::S` - --> $DIR/missing_field.rs:12:18 + --> $DIR/missing_field.rs:11:18 | -12 | #[serde(remote = "remote::S")] +11 | #[serde(remote = "remote::S")] | ^^^^^^^^^^^ missing `b` error: aborting due to previous error diff --git a/test_suite/tests/ui/remote/nonremote_getter.rs b/test_suite/tests/ui/remote/nonremote_getter.rs index 23346d33..6c5f4681 100644 --- a/test_suite/tests/ui/remote/nonremote_getter.rs +++ b/test_suite/tests/ui/remote/nonremote_getter.rs @@ -1,5 +1,4 @@ -#[macro_use] -extern crate serde_derive; +use serde_derive::Serialize; #[derive(Serialize)] struct S { diff --git a/test_suite/tests/ui/remote/nonremote_getter.stderr b/test_suite/tests/ui/remote/nonremote_getter.stderr index 34b504be..446f523c 100644 --- a/test_suite/tests/ui/remote/nonremote_getter.stderr +++ b/test_suite/tests/ui/remote/nonremote_getter.stderr @@ -1,10 +1,10 @@ error: #[serde(getter = "...")] can only be used in structs that have #[serde(remote = "...")] - --> $DIR/nonremote_getter.rs:5:1 + --> $DIR/nonremote_getter.rs:4:1 | -5 | / struct S { -6 | | #[serde(getter = "S::get")] -7 | | a: u8, -8 | | } +4 | / struct S { +5 | | #[serde(getter = "S::get")] +6 | | a: u8, +7 | | } | |_^ error: aborting due to previous error diff --git a/test_suite/tests/ui/remote/unknown_field.rs b/test_suite/tests/ui/remote/unknown_field.rs index a71ee6dd..dd59cdcc 100644 --- a/test_suite/tests/ui/remote/unknown_field.rs +++ b/test_suite/tests/ui/remote/unknown_field.rs @@ -1,5 +1,4 @@ -#[macro_use] -extern crate serde_derive; +use serde_derive::{Serialize, Deserialize}; mod remote { pub struct S { diff --git a/test_suite/tests/ui/remote/unknown_field.stderr b/test_suite/tests/ui/remote/unknown_field.stderr index 0351b7e2..b7054906 100644 --- a/test_suite/tests/ui/remote/unknown_field.stderr +++ b/test_suite/tests/ui/remote/unknown_field.stderr @@ -1,13 +1,13 @@ error[E0609]: no field `b` on type `&remote::S` - --> $DIR/unknown_field.rs:13:5 + --> $DIR/unknown_field.rs:12:5 | -13 | b: u8, +12 | b: u8, | ^ error[E0560]: struct `remote::S` has no field named `b` - --> $DIR/unknown_field.rs:13:5 + --> $DIR/unknown_field.rs:12:5 | -13 | b: u8, +12 | b: u8, | ^ field does not exist - did you mean `a`? error: aborting due to 2 previous errors diff --git a/test_suite/tests/ui/remote/wrong_de.rs b/test_suite/tests/ui/remote/wrong_de.rs index 7e370b99..38f597a2 100644 --- a/test_suite/tests/ui/remote/wrong_de.rs +++ b/test_suite/tests/ui/remote/wrong_de.rs @@ -1,5 +1,4 @@ -#[macro_use] -extern crate serde_derive; +use serde_derive::Deserialize; mod remote { pub struct S(pub u16); diff --git a/test_suite/tests/ui/remote/wrong_de.stderr b/test_suite/tests/ui/remote/wrong_de.stderr index 38743b40..9c95ee61 100644 --- a/test_suite/tests/ui/remote/wrong_de.stderr +++ b/test_suite/tests/ui/remote/wrong_de.stderr @@ -1,11 +1,11 @@ error[E0308]: mismatched types - --> $DIR/wrong_de.rs:8:10 + --> $DIR/wrong_de.rs:7:10 | -8 | #[derive(Deserialize)] +7 | #[derive(Deserialize)] | ^^^^^^^^^^^ expected u16, found u8 help: you can cast an `u8` to `u16`, which will zero-extend the source value | -8 | #[derive(Deserialize.into())] +7 | #[derive(Deserialize.into())] | ^^^^^^^^^^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/remote/wrong_getter.rs b/test_suite/tests/ui/remote/wrong_getter.rs index b6da40d8..5edb01fb 100644 --- a/test_suite/tests/ui/remote/wrong_getter.rs +++ b/test_suite/tests/ui/remote/wrong_getter.rs @@ -1,5 +1,4 @@ -#[macro_use] -extern crate serde_derive; +use serde_derive::Serialize; mod remote { pub struct S { diff --git a/test_suite/tests/ui/remote/wrong_getter.stderr b/test_suite/tests/ui/remote/wrong_getter.stderr index b421bb01..4c161405 100644 --- a/test_suite/tests/ui/remote/wrong_getter.stderr +++ b/test_suite/tests/ui/remote/wrong_getter.stderr @@ -1,7 +1,7 @@ error[E0308]: mismatched types - --> $DIR/wrong_getter.rs:16:10 + --> $DIR/wrong_getter.rs:15:10 | -16 | #[derive(Serialize)] +15 | #[derive(Serialize)] | ^^^^^^^^^ expected u8, found u16 | = note: expected type `&u8` diff --git a/test_suite/tests/ui/remote/wrong_ser.rs b/test_suite/tests/ui/remote/wrong_ser.rs index 91bd234a..c813f0b1 100644 --- a/test_suite/tests/ui/remote/wrong_ser.rs +++ b/test_suite/tests/ui/remote/wrong_ser.rs @@ -1,5 +1,4 @@ -#[macro_use] -extern crate serde_derive; +use serde_derive::Serialize; mod remote { pub struct S { diff --git a/test_suite/tests/ui/remote/wrong_ser.stderr b/test_suite/tests/ui/remote/wrong_ser.stderr index 741af571..76a35f4e 100644 --- a/test_suite/tests/ui/remote/wrong_ser.stderr +++ b/test_suite/tests/ui/remote/wrong_ser.stderr @@ -1,11 +1,11 @@ error[E0308]: mismatched types - --> $DIR/wrong_ser.rs:10:10 - | -10 | #[derive(Serialize)] - | ^^^^^^^^^ expected u8, found u16 - | - = note: expected type `&u8` - found type `&u16` + --> $DIR/wrong_ser.rs:9:10 + | +9 | #[derive(Serialize)] + | ^^^^^^^^^ expected u8, found u16 + | + = note: expected type `&u8` + found type `&u16` error: aborting due to previous error diff --git a/test_suite/tests/ui/rename/container_unknown_rename_rule.rs b/test_suite/tests/ui/rename/container_unknown_rename_rule.rs index 3d3a518e..4bd1a405 100644 --- a/test_suite/tests/ui/rename/container_unknown_rename_rule.rs +++ b/test_suite/tests/ui/rename/container_unknown_rename_rule.rs @@ -1,5 +1,4 @@ -#[macro_use] -extern crate serde_derive; +use serde_derive::Serialize; #[derive(Serialize)] #[serde(rename_all = "abc")] diff --git a/test_suite/tests/ui/rename/container_unknown_rename_rule.stderr b/test_suite/tests/ui/rename/container_unknown_rename_rule.stderr index 20ad1d7a..6728b612 100644 --- a/test_suite/tests/ui/rename/container_unknown_rename_rule.stderr +++ b/test_suite/tests/ui/rename/container_unknown_rename_rule.stderr @@ -1,7 +1,7 @@ error: unknown rename rule for #[serde(rename_all = "abc")] - --> $DIR/container_unknown_rename_rule.rs:5:22 + --> $DIR/container_unknown_rename_rule.rs:4:22 | -5 | #[serde(rename_all = "abc")] +4 | #[serde(rename_all = "abc")] | ^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/rename/variant_unknown_rename_rule.rs b/test_suite/tests/ui/rename/variant_unknown_rename_rule.rs index 700a56e8..11a8e9a6 100644 --- a/test_suite/tests/ui/rename/variant_unknown_rename_rule.rs +++ b/test_suite/tests/ui/rename/variant_unknown_rename_rule.rs @@ -1,5 +1,4 @@ -#[macro_use] -extern crate serde_derive; +use serde_derive::Serialize; #[derive(Serialize)] enum S { diff --git a/test_suite/tests/ui/rename/variant_unknown_rename_rule.stderr b/test_suite/tests/ui/rename/variant_unknown_rename_rule.stderr index 079c6145..f31e1abe 100644 --- a/test_suite/tests/ui/rename/variant_unknown_rename_rule.stderr +++ b/test_suite/tests/ui/rename/variant_unknown_rename_rule.stderr @@ -1,7 +1,7 @@ error: unknown rename rule for #[serde(rename_all = "abc")] - --> $DIR/variant_unknown_rename_rule.rs:6:26 + --> $DIR/variant_unknown_rename_rule.rs:5:26 | -6 | #[serde(rename_all = "abc")] +5 | #[serde(rename_all = "abc")] | ^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/struct-representation/internally-tagged-tuple.rs b/test_suite/tests/ui/struct-representation/internally-tagged-tuple.rs index 3a62df35..ff878ad7 100644 --- a/test_suite/tests/ui/struct-representation/internally-tagged-tuple.rs +++ b/test_suite/tests/ui/struct-representation/internally-tagged-tuple.rs @@ -1,5 +1,4 @@ -#[macro_use] -extern crate serde_derive; +use serde_derive::Serialize; #[derive(Serialize)] #[serde(tag = "type")] diff --git a/test_suite/tests/ui/struct-representation/internally-tagged-tuple.stderr b/test_suite/tests/ui/struct-representation/internally-tagged-tuple.stderr index ab505a09..52b3f77b 100644 --- a/test_suite/tests/ui/struct-representation/internally-tagged-tuple.stderr +++ b/test_suite/tests/ui/struct-representation/internally-tagged-tuple.stderr @@ -1,7 +1,7 @@ error: #[serde(tag = "...")] can only be used on enums and structs with named fields - --> $DIR/internally-tagged-tuple.rs:6:9 + --> $DIR/internally-tagged-tuple.rs:5:9 | -6 | struct S(u8, u8); +5 | struct S(u8, u8); | ^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/struct-representation/internally-tagged-unit.rs b/test_suite/tests/ui/struct-representation/internally-tagged-unit.rs index cd38cd76..8dc87cd3 100644 --- a/test_suite/tests/ui/struct-representation/internally-tagged-unit.rs +++ b/test_suite/tests/ui/struct-representation/internally-tagged-unit.rs @@ -1,5 +1,4 @@ -#[macro_use] -extern crate serde_derive; +use serde_derive::Serialize; #[derive(Serialize)] #[serde(tag = "type")] diff --git a/test_suite/tests/ui/struct-representation/internally-tagged-unit.stderr b/test_suite/tests/ui/struct-representation/internally-tagged-unit.stderr index ba0cbb40..31fca000 100644 --- a/test_suite/tests/ui/struct-representation/internally-tagged-unit.stderr +++ b/test_suite/tests/ui/struct-representation/internally-tagged-unit.stderr @@ -1,7 +1,7 @@ error: #[serde(tag = "...")] can only be used on enums and structs with named fields - --> $DIR/internally-tagged-unit.rs:4:10 + --> $DIR/internally-tagged-unit.rs:3:10 | -4 | #[derive(Serialize)] +3 | #[derive(Serialize)] | ^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/transparent/at_most_one.rs b/test_suite/tests/ui/transparent/at_most_one.rs index 8810ce6d..9332ba59 100644 --- a/test_suite/tests/ui/transparent/at_most_one.rs +++ b/test_suite/tests/ui/transparent/at_most_one.rs @@ -1,5 +1,4 @@ -#[macro_use] -extern crate serde_derive; +use serde_derive::Serialize; #[derive(Serialize)] #[serde(transparent)] diff --git a/test_suite/tests/ui/transparent/at_most_one.stderr b/test_suite/tests/ui/transparent/at_most_one.stderr index 904f014d..dcdbfa9b 100644 --- a/test_suite/tests/ui/transparent/at_most_one.stderr +++ b/test_suite/tests/ui/transparent/at_most_one.stderr @@ -1,11 +1,11 @@ error: #[serde(transparent)] requires struct to have at most one transparent field - --> $DIR/at_most_one.rs:5:1 + --> $DIR/at_most_one.rs:4:1 | -5 | / #[serde(transparent)] -6 | | struct S { -7 | | a: u8, -8 | | b: u8, -9 | | } +4 | / #[serde(transparent)] +5 | | struct S { +6 | | a: u8, +7 | | b: u8, +8 | | } | |_^ error: aborting due to previous error diff --git a/test_suite/tests/ui/transparent/de_at_least_one.rs b/test_suite/tests/ui/transparent/de_at_least_one.rs index 12b260e5..b5e9ce48 100644 --- a/test_suite/tests/ui/transparent/de_at_least_one.rs +++ b/test_suite/tests/ui/transparent/de_at_least_one.rs @@ -1,5 +1,4 @@ -#[macro_use] -extern crate serde_derive; +use serde_derive::Deserialize; #[derive(Deserialize)] #[serde(transparent)] diff --git a/test_suite/tests/ui/transparent/de_at_least_one.stderr b/test_suite/tests/ui/transparent/de_at_least_one.stderr index 95a8f7ff..aa9d4ea7 100644 --- a/test_suite/tests/ui/transparent/de_at_least_one.stderr +++ b/test_suite/tests/ui/transparent/de_at_least_one.stderr @@ -1,13 +1,13 @@ error: #[serde(transparent)] requires at least one field that is neither skipped nor has a default - --> $DIR/de_at_least_one.rs:5:1 + --> $DIR/de_at_least_one.rs:4:1 | -5 | / #[serde(transparent)] -6 | | struct S { -7 | | #[serde(skip)] -8 | | a: u8, -9 | | #[serde(default)] -10 | | b: u8, -11 | | } +4 | / #[serde(transparent)] +5 | | struct S { +6 | | #[serde(skip)] +7 | | a: u8, +8 | | #[serde(default)] +9 | | b: u8, +10 | | } | |_^ error: aborting due to previous error diff --git a/test_suite/tests/ui/transparent/enum.rs b/test_suite/tests/ui/transparent/enum.rs index 54ce5b5d..d033b200 100644 --- a/test_suite/tests/ui/transparent/enum.rs +++ b/test_suite/tests/ui/transparent/enum.rs @@ -1,5 +1,4 @@ -#[macro_use] -extern crate serde_derive; +use serde_derive::Serialize; #[derive(Serialize)] #[serde(transparent)] diff --git a/test_suite/tests/ui/transparent/enum.stderr b/test_suite/tests/ui/transparent/enum.stderr index 2cdc6631..d1ee11ad 100644 --- a/test_suite/tests/ui/transparent/enum.stderr +++ b/test_suite/tests/ui/transparent/enum.stderr @@ -1,8 +1,8 @@ error: #[serde(transparent)] is not allowed on an enum - --> $DIR/enum.rs:5:1 + --> $DIR/enum.rs:4:1 | -5 | / #[serde(transparent)] -6 | | enum E {} +4 | / #[serde(transparent)] +5 | | enum E {} | |_________^ error: aborting due to previous error diff --git a/test_suite/tests/ui/transparent/ser_at_least_one.rs b/test_suite/tests/ui/transparent/ser_at_least_one.rs index b6455826..86d128ee 100644 --- a/test_suite/tests/ui/transparent/ser_at_least_one.rs +++ b/test_suite/tests/ui/transparent/ser_at_least_one.rs @@ -1,5 +1,4 @@ -#[macro_use] -extern crate serde_derive; +use serde_derive::Serialize; #[derive(Serialize)] #[serde(transparent)] diff --git a/test_suite/tests/ui/transparent/ser_at_least_one.stderr b/test_suite/tests/ui/transparent/ser_at_least_one.stderr index 46226078..bf1b9a20 100644 --- a/test_suite/tests/ui/transparent/ser_at_least_one.stderr +++ b/test_suite/tests/ui/transparent/ser_at_least_one.stderr @@ -1,11 +1,11 @@ error: #[serde(transparent)] requires at least one field that is not skipped - --> $DIR/ser_at_least_one.rs:5:1 + --> $DIR/ser_at_least_one.rs:4:1 | -5 | / #[serde(transparent)] -6 | | struct S { -7 | | #[serde(skip)] -8 | | a: u8, -9 | | } +4 | / #[serde(transparent)] +5 | | struct S { +6 | | #[serde(skip)] +7 | | a: u8, +8 | | } | |_^ error: aborting due to previous error diff --git a/test_suite/tests/ui/transparent/unit_struct.rs b/test_suite/tests/ui/transparent/unit_struct.rs index cc08d49c..295481c8 100644 --- a/test_suite/tests/ui/transparent/unit_struct.rs +++ b/test_suite/tests/ui/transparent/unit_struct.rs @@ -1,5 +1,4 @@ -#[macro_use] -extern crate serde_derive; +use serde_derive::Serialize; #[derive(Serialize)] #[serde(transparent)] diff --git a/test_suite/tests/ui/transparent/unit_struct.stderr b/test_suite/tests/ui/transparent/unit_struct.stderr index 0f921aaa..82956cf3 100644 --- a/test_suite/tests/ui/transparent/unit_struct.stderr +++ b/test_suite/tests/ui/transparent/unit_struct.stderr @@ -1,8 +1,8 @@ error: #[serde(transparent)] is not allowed on a unit struct - --> $DIR/unit_struct.rs:5:1 + --> $DIR/unit_struct.rs:4:1 | -5 | / #[serde(transparent)] -6 | | struct S; +4 | / #[serde(transparent)] +5 | | struct S; | |_________^ error: aborting due to previous error diff --git a/test_suite/tests/ui/transparent/with_from.rs b/test_suite/tests/ui/transparent/with_from.rs index 42863eb0..b6ac5cb6 100644 --- a/test_suite/tests/ui/transparent/with_from.rs +++ b/test_suite/tests/ui/transparent/with_from.rs @@ -1,5 +1,4 @@ -#[macro_use] -extern crate serde_derive; +use serde_derive::Serialize; #[derive(Serialize)] #[serde(transparent, from = "u64")] diff --git a/test_suite/tests/ui/transparent/with_from.stderr b/test_suite/tests/ui/transparent/with_from.stderr index 40efc720..3fd789b7 100644 --- a/test_suite/tests/ui/transparent/with_from.stderr +++ b/test_suite/tests/ui/transparent/with_from.stderr @@ -1,10 +1,10 @@ error: #[serde(transparent)] is not allowed with #[serde(from = "...")] - --> $DIR/with_from.rs:5:1 + --> $DIR/with_from.rs:4:1 | -5 | / #[serde(transparent, from = "u64")] -6 | | struct S { -7 | | a: u8, -8 | | } +4 | / #[serde(transparent, from = "u64")] +5 | | struct S { +6 | | a: u8, +7 | | } | |_^ error: aborting due to previous error diff --git a/test_suite/tests/ui/transparent/with_into.rs b/test_suite/tests/ui/transparent/with_into.rs index e9e85ce7..9e807a04 100644 --- a/test_suite/tests/ui/transparent/with_into.rs +++ b/test_suite/tests/ui/transparent/with_into.rs @@ -1,5 +1,4 @@ -#[macro_use] -extern crate serde_derive; +use serde_derive::Serialize; #[derive(Serialize)] #[serde(transparent, into = "u64")] diff --git a/test_suite/tests/ui/transparent/with_into.stderr b/test_suite/tests/ui/transparent/with_into.stderr index 057d0c9c..816a4276 100644 --- a/test_suite/tests/ui/transparent/with_into.stderr +++ b/test_suite/tests/ui/transparent/with_into.stderr @@ -1,10 +1,10 @@ error: #[serde(transparent)] is not allowed with #[serde(into = "...")] - --> $DIR/with_into.rs:5:1 + --> $DIR/with_into.rs:4:1 | -5 | / #[serde(transparent, into = "u64")] -6 | | struct S { -7 | | a: u8, -8 | | } +4 | / #[serde(transparent, into = "u64")] +5 | | struct S { +6 | | a: u8, +7 | | } | |_^ error: aborting due to previous error diff --git a/test_suite/tests/ui/type-attribute/from.rs b/test_suite/tests/ui/type-attribute/from.rs index f59ed2af..4d1bf771 100644 --- a/test_suite/tests/ui/type-attribute/from.rs +++ b/test_suite/tests/ui/type-attribute/from.rs @@ -1,5 +1,4 @@ -#[macro_use] -extern crate serde_derive; +use serde_derive::Deserialize; #[derive(Deserialize)] #[serde(from = "Option $DIR/from.rs:5:16 + --> $DIR/from.rs:4:16 | -5 | #[serde(from = "Option $DIR/into.rs:5:16 + --> $DIR/into.rs:4:16 | -5 | #[serde(into = "Option $DIR/container.rs:5:9 + --> $DIR/container.rs:4:9 | -5 | #[serde("literal")] +4 | #[serde("literal")] | ^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/unexpected-literal/field.rs b/test_suite/tests/ui/unexpected-literal/field.rs index 94bfb16a..79278252 100644 --- a/test_suite/tests/ui/unexpected-literal/field.rs +++ b/test_suite/tests/ui/unexpected-literal/field.rs @@ -1,5 +1,4 @@ -#[macro_use] -extern crate serde_derive; +use serde_derive::Serialize; #[derive(Serialize)] struct S { diff --git a/test_suite/tests/ui/unexpected-literal/field.stderr b/test_suite/tests/ui/unexpected-literal/field.stderr index b8e7b7cb..57954031 100644 --- a/test_suite/tests/ui/unexpected-literal/field.stderr +++ b/test_suite/tests/ui/unexpected-literal/field.stderr @@ -1,7 +1,7 @@ error: unexpected literal in serde field attribute - --> $DIR/field.rs:6:13 + --> $DIR/field.rs:5:13 | -6 | #[serde("literal")] +5 | #[serde("literal")] | ^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/unexpected-literal/variant.rs b/test_suite/tests/ui/unexpected-literal/variant.rs index ae8b8a80..df831392 100644 --- a/test_suite/tests/ui/unexpected-literal/variant.rs +++ b/test_suite/tests/ui/unexpected-literal/variant.rs @@ -1,5 +1,4 @@ -#[macro_use] -extern crate serde_derive; +use serde_derive::Serialize; #[derive(Serialize)] enum E { diff --git a/test_suite/tests/ui/unexpected-literal/variant.stderr b/test_suite/tests/ui/unexpected-literal/variant.stderr index ba2c841e..6c4904b0 100644 --- a/test_suite/tests/ui/unexpected-literal/variant.stderr +++ b/test_suite/tests/ui/unexpected-literal/variant.stderr @@ -1,7 +1,7 @@ error: unexpected literal in serde variant attribute - --> $DIR/variant.rs:6:13 + --> $DIR/variant.rs:5:13 | -6 | #[serde("literal")] +5 | #[serde("literal")] | ^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/unknown-attribute/container.rs b/test_suite/tests/ui/unknown-attribute/container.rs index bd554f22..68345b81 100644 --- a/test_suite/tests/ui/unknown-attribute/container.rs +++ b/test_suite/tests/ui/unknown-attribute/container.rs @@ -1,5 +1,4 @@ -#[macro_use] -extern crate serde_derive; +use serde_derive::Serialize; #[derive(Serialize)] #[serde(abc = "xyz")] diff --git a/test_suite/tests/ui/unknown-attribute/container.stderr b/test_suite/tests/ui/unknown-attribute/container.stderr index 9f6bb0d1..dbb589c1 100644 --- a/test_suite/tests/ui/unknown-attribute/container.stderr +++ b/test_suite/tests/ui/unknown-attribute/container.stderr @@ -1,7 +1,7 @@ error: unknown serde container attribute `abc` - --> $DIR/container.rs:5:9 + --> $DIR/container.rs:4:9 | -5 | #[serde(abc = "xyz")] +4 | #[serde(abc = "xyz")] | ^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/unknown-attribute/field.rs b/test_suite/tests/ui/unknown-attribute/field.rs index 3bd0d6cd..50789dd8 100644 --- a/test_suite/tests/ui/unknown-attribute/field.rs +++ b/test_suite/tests/ui/unknown-attribute/field.rs @@ -1,5 +1,4 @@ -#[macro_use] -extern crate serde_derive; +use serde_derive::Serialize; #[derive(Serialize)] struct C { diff --git a/test_suite/tests/ui/unknown-attribute/field.stderr b/test_suite/tests/ui/unknown-attribute/field.stderr index e5d0ca73..d95e280b 100644 --- a/test_suite/tests/ui/unknown-attribute/field.stderr +++ b/test_suite/tests/ui/unknown-attribute/field.stderr @@ -1,7 +1,7 @@ error: unknown serde field attribute `abc` - --> $DIR/field.rs:6:13 + --> $DIR/field.rs:5:13 | -6 | #[serde(abc = "xyz")] +5 | #[serde(abc = "xyz")] | ^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/unknown-attribute/variant.rs b/test_suite/tests/ui/unknown-attribute/variant.rs index 4b4d462e..e05c11ae 100644 --- a/test_suite/tests/ui/unknown-attribute/variant.rs +++ b/test_suite/tests/ui/unknown-attribute/variant.rs @@ -1,5 +1,4 @@ -#[macro_use] -extern crate serde_derive; +use serde_derive::Serialize; #[derive(Serialize)] enum E { diff --git a/test_suite/tests/ui/unknown-attribute/variant.stderr b/test_suite/tests/ui/unknown-attribute/variant.stderr index 273d7c0d..a3d58607 100644 --- a/test_suite/tests/ui/unknown-attribute/variant.stderr +++ b/test_suite/tests/ui/unknown-attribute/variant.stderr @@ -1,7 +1,7 @@ error: unknown serde variant attribute `abc` - --> $DIR/variant.rs:6:13 + --> $DIR/variant.rs:5:13 | -6 | #[serde(abc = "xyz")] +5 | #[serde(abc = "xyz")] | ^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/unsupported/union_de.rs b/test_suite/tests/ui/unsupported/union_de.rs index 19e0a437..29f4330d 100644 --- a/test_suite/tests/ui/unsupported/union_de.rs +++ b/test_suite/tests/ui/unsupported/union_de.rs @@ -1,5 +1,4 @@ -#[macro_use] -extern crate serde_derive; +use serde_derive::Deserialize; #[derive(Deserialize)] union Union { diff --git a/test_suite/tests/ui/unsupported/union_de.stderr b/test_suite/tests/ui/unsupported/union_de.stderr index 0b087062..4f674e0d 100644 --- a/test_suite/tests/ui/unsupported/union_de.stderr +++ b/test_suite/tests/ui/unsupported/union_de.stderr @@ -1,10 +1,10 @@ error: Serde does not support derive for unions - --> $DIR/union_de.rs:5:1 + --> $DIR/union_de.rs:4:1 | -5 | / union Union { -6 | | x: u8, -7 | | y: (), -8 | | } +4 | / union Union { +5 | | x: u8, +6 | | y: (), +7 | | } | |_^ error: aborting due to previous error diff --git a/test_suite/tests/ui/unsupported/union_ser.rs b/test_suite/tests/ui/unsupported/union_ser.rs index 19e0a437..29f4330d 100644 --- a/test_suite/tests/ui/unsupported/union_ser.rs +++ b/test_suite/tests/ui/unsupported/union_ser.rs @@ -1,5 +1,4 @@ -#[macro_use] -extern crate serde_derive; +use serde_derive::Deserialize; #[derive(Deserialize)] union Union { diff --git a/test_suite/tests/ui/unsupported/union_ser.stderr b/test_suite/tests/ui/unsupported/union_ser.stderr index 0d808b88..9535cc8e 100644 --- a/test_suite/tests/ui/unsupported/union_ser.stderr +++ b/test_suite/tests/ui/unsupported/union_ser.stderr @@ -1,10 +1,10 @@ error: Serde does not support derive for unions - --> $DIR/union_ser.rs:5:1 + --> $DIR/union_ser.rs:4:1 | -5 | / union Union { -6 | | x: u8, -7 | | y: (), -8 | | } +4 | / union Union { +5 | | x: u8, +6 | | y: (), +7 | | } | |_^ error: aborting due to previous error diff --git a/test_suite/tests/ui/with-variant/skip_de_newtype_field.rs b/test_suite/tests/ui/with-variant/skip_de_newtype_field.rs index 8c5a2996..1eac50ec 100644 --- a/test_suite/tests/ui/with-variant/skip_de_newtype_field.rs +++ b/test_suite/tests/ui/with-variant/skip_de_newtype_field.rs @@ -1,5 +1,4 @@ -#[macro_use] -extern crate serde_derive; +use serde_derive::Deserialize; #[derive(Deserialize)] enum Enum { diff --git a/test_suite/tests/ui/with-variant/skip_de_newtype_field.stderr b/test_suite/tests/ui/with-variant/skip_de_newtype_field.stderr index 6fa19d4c..1b5f15cd 100644 --- a/test_suite/tests/ui/with-variant/skip_de_newtype_field.stderr +++ b/test_suite/tests/ui/with-variant/skip_de_newtype_field.stderr @@ -1,8 +1,8 @@ error: variant `Newtype` cannot have both #[serde(deserialize_with)] and a field #0 marked with #[serde(skip_deserializing)] - --> $DIR/skip_de_newtype_field.rs:6:5 + --> $DIR/skip_de_newtype_field.rs:5:5 | -6 | / #[serde(deserialize_with = "deserialize_some_newtype_variant")] -7 | | Newtype(#[serde(skip_deserializing)] String), +5 | / #[serde(deserialize_with = "deserialize_some_newtype_variant")] +6 | | Newtype(#[serde(skip_deserializing)] String), | |________________________________________________^ error: aborting due to previous error diff --git a/test_suite/tests/ui/with-variant/skip_de_struct_field.rs b/test_suite/tests/ui/with-variant/skip_de_struct_field.rs index 4770d4ec..8ac0e1b2 100644 --- a/test_suite/tests/ui/with-variant/skip_de_struct_field.rs +++ b/test_suite/tests/ui/with-variant/skip_de_struct_field.rs @@ -1,5 +1,4 @@ -#[macro_use] -extern crate serde_derive; +use serde_derive::Deserialize; #[derive(Deserialize)] enum Enum { diff --git a/test_suite/tests/ui/with-variant/skip_de_struct_field.stderr b/test_suite/tests/ui/with-variant/skip_de_struct_field.stderr index a7a848f7..7b3649c6 100644 --- a/test_suite/tests/ui/with-variant/skip_de_struct_field.stderr +++ b/test_suite/tests/ui/with-variant/skip_de_struct_field.stderr @@ -1,12 +1,12 @@ error: variant `Struct` cannot have both #[serde(deserialize_with)] and a field `f1` marked with #[serde(skip_deserializing)] - --> $DIR/skip_de_struct_field.rs:6:5 + --> $DIR/skip_de_struct_field.rs:5:5 | -6 | / #[serde(deserialize_with = "deserialize_some_other_variant")] -7 | | Struct { -8 | | #[serde(skip_deserializing)] -9 | | f1: String, -10 | | f2: u8, -11 | | }, +5 | / #[serde(deserialize_with = "deserialize_some_other_variant")] +6 | | Struct { +7 | | #[serde(skip_deserializing)] +8 | | f1: String, +9 | | f2: u8, +10 | | }, | |_____^ error: aborting due to previous error diff --git a/test_suite/tests/ui/with-variant/skip_de_tuple_field.rs b/test_suite/tests/ui/with-variant/skip_de_tuple_field.rs index a3d078cb..dfb1c6f0 100644 --- a/test_suite/tests/ui/with-variant/skip_de_tuple_field.rs +++ b/test_suite/tests/ui/with-variant/skip_de_tuple_field.rs @@ -1,5 +1,4 @@ -#[macro_use] -extern crate serde_derive; +use serde_derive::Deserialize; #[derive(Deserialize)] enum Enum { diff --git a/test_suite/tests/ui/with-variant/skip_de_tuple_field.stderr b/test_suite/tests/ui/with-variant/skip_de_tuple_field.stderr index 716e7d12..5c3e44e1 100644 --- a/test_suite/tests/ui/with-variant/skip_de_tuple_field.stderr +++ b/test_suite/tests/ui/with-variant/skip_de_tuple_field.stderr @@ -1,8 +1,8 @@ error: variant `Tuple` cannot have both #[serde(deserialize_with)] and a field #0 marked with #[serde(skip_deserializing)] - --> $DIR/skip_de_tuple_field.rs:6:5 + --> $DIR/skip_de_tuple_field.rs:5:5 | -6 | / #[serde(deserialize_with = "deserialize_some_other_variant")] -7 | | Tuple(#[serde(skip_deserializing)] String, u8), +5 | / #[serde(deserialize_with = "deserialize_some_other_variant")] +6 | | Tuple(#[serde(skip_deserializing)] String, u8), | |__________________________________________________^ error: aborting due to previous error diff --git a/test_suite/tests/ui/with-variant/skip_de_whole_variant.rs b/test_suite/tests/ui/with-variant/skip_de_whole_variant.rs index 0a39212c..7ad71d94 100644 --- a/test_suite/tests/ui/with-variant/skip_de_whole_variant.rs +++ b/test_suite/tests/ui/with-variant/skip_de_whole_variant.rs @@ -1,5 +1,4 @@ -#[macro_use] -extern crate serde_derive; +use serde_derive::Deserialize; #[derive(Deserialize)] enum Enum { diff --git a/test_suite/tests/ui/with-variant/skip_de_whole_variant.stderr b/test_suite/tests/ui/with-variant/skip_de_whole_variant.stderr index 4414d13c..2d5ac064 100644 --- a/test_suite/tests/ui/with-variant/skip_de_whole_variant.stderr +++ b/test_suite/tests/ui/with-variant/skip_de_whole_variant.stderr @@ -1,9 +1,9 @@ error: variant `Unit` cannot have both #[serde(deserialize_with)] and #[serde(skip_deserializing)] - --> $DIR/skip_de_whole_variant.rs:6:5 + --> $DIR/skip_de_whole_variant.rs:5:5 | -6 | / #[serde(deserialize_with = "deserialize_some_unit_variant")] -7 | | #[serde(skip_deserializing)] -8 | | Unit, +5 | / #[serde(deserialize_with = "deserialize_some_unit_variant")] +6 | | #[serde(skip_deserializing)] +7 | | Unit, | |________^ error: aborting due to previous error diff --git a/test_suite/tests/ui/with-variant/skip_ser_newtype_field.rs b/test_suite/tests/ui/with-variant/skip_ser_newtype_field.rs index 911f462d..ff9a6d71 100644 --- a/test_suite/tests/ui/with-variant/skip_ser_newtype_field.rs +++ b/test_suite/tests/ui/with-variant/skip_ser_newtype_field.rs @@ -1,5 +1,4 @@ -#[macro_use] -extern crate serde_derive; +use serde_derive::Serialize; #[derive(Serialize)] enum Enum { diff --git a/test_suite/tests/ui/with-variant/skip_ser_newtype_field.stderr b/test_suite/tests/ui/with-variant/skip_ser_newtype_field.stderr index b448c4db..3298c527 100644 --- a/test_suite/tests/ui/with-variant/skip_ser_newtype_field.stderr +++ b/test_suite/tests/ui/with-variant/skip_ser_newtype_field.stderr @@ -1,8 +1,8 @@ error: variant `Newtype` cannot have both #[serde(serialize_with)] and a field #0 marked with #[serde(skip_serializing)] - --> $DIR/skip_ser_newtype_field.rs:6:5 + --> $DIR/skip_ser_newtype_field.rs:5:5 | -6 | / #[serde(serialize_with = "serialize_some_newtype_variant")] -7 | | Newtype(#[serde(skip_serializing)] String), +5 | / #[serde(serialize_with = "serialize_some_newtype_variant")] +6 | | Newtype(#[serde(skip_serializing)] String), | |______________________________________________^ error: aborting due to previous error diff --git a/test_suite/tests/ui/with-variant/skip_ser_newtype_field_if.rs b/test_suite/tests/ui/with-variant/skip_ser_newtype_field_if.rs index 28a11db6..19296f07 100644 --- a/test_suite/tests/ui/with-variant/skip_ser_newtype_field_if.rs +++ b/test_suite/tests/ui/with-variant/skip_ser_newtype_field_if.rs @@ -1,5 +1,4 @@ -#[macro_use] -extern crate serde_derive; +use serde_derive::Serialize; #[derive(Serialize)] enum Enum { diff --git a/test_suite/tests/ui/with-variant/skip_ser_newtype_field_if.stderr b/test_suite/tests/ui/with-variant/skip_ser_newtype_field_if.stderr index ff1f717a..09c7ba43 100644 --- a/test_suite/tests/ui/with-variant/skip_ser_newtype_field_if.stderr +++ b/test_suite/tests/ui/with-variant/skip_ser_newtype_field_if.stderr @@ -1,8 +1,8 @@ error: variant `Newtype` cannot have both #[serde(serialize_with)] and a field #0 marked with #[serde(skip_serializing_if)] - --> $DIR/skip_ser_newtype_field_if.rs:6:5 + --> $DIR/skip_ser_newtype_field_if.rs:5:5 | -6 | / #[serde(serialize_with = "serialize_some_newtype_variant")] -7 | | Newtype(#[serde(skip_serializing_if = "always")] String), +5 | / #[serde(serialize_with = "serialize_some_newtype_variant")] +6 | | Newtype(#[serde(skip_serializing_if = "always")] String), | |____________________________________________________________^ error: aborting due to previous error diff --git a/test_suite/tests/ui/with-variant/skip_ser_struct_field.rs b/test_suite/tests/ui/with-variant/skip_ser_struct_field.rs index ab47dade..2845189c 100644 --- a/test_suite/tests/ui/with-variant/skip_ser_struct_field.rs +++ b/test_suite/tests/ui/with-variant/skip_ser_struct_field.rs @@ -1,5 +1,4 @@ -#[macro_use] -extern crate serde_derive; +use serde_derive::Serialize; #[derive(Serialize)] enum Enum { diff --git a/test_suite/tests/ui/with-variant/skip_ser_struct_field.stderr b/test_suite/tests/ui/with-variant/skip_ser_struct_field.stderr index 4dec7658..fca04c58 100644 --- a/test_suite/tests/ui/with-variant/skip_ser_struct_field.stderr +++ b/test_suite/tests/ui/with-variant/skip_ser_struct_field.stderr @@ -1,12 +1,12 @@ error: variant `Struct` cannot have both #[serde(serialize_with)] and a field `f1` marked with #[serde(skip_serializing)] - --> $DIR/skip_ser_struct_field.rs:6:5 + --> $DIR/skip_ser_struct_field.rs:5:5 | -6 | / #[serde(serialize_with = "serialize_some_other_variant")] -7 | | Struct { -8 | | #[serde(skip_serializing)] -9 | | f1: String, -10 | | f2: u8, -11 | | }, +5 | / #[serde(serialize_with = "serialize_some_other_variant")] +6 | | Struct { +7 | | #[serde(skip_serializing)] +8 | | f1: String, +9 | | f2: u8, +10 | | }, | |_____^ error: aborting due to previous error diff --git a/test_suite/tests/ui/with-variant/skip_ser_struct_field_if.rs b/test_suite/tests/ui/with-variant/skip_ser_struct_field_if.rs index 6ccfad35..cdf98046 100644 --- a/test_suite/tests/ui/with-variant/skip_ser_struct_field_if.rs +++ b/test_suite/tests/ui/with-variant/skip_ser_struct_field_if.rs @@ -1,5 +1,4 @@ -#[macro_use] -extern crate serde_derive; +use serde_derive::Serialize; #[derive(Serialize)] enum Enum { diff --git a/test_suite/tests/ui/with-variant/skip_ser_struct_field_if.stderr b/test_suite/tests/ui/with-variant/skip_ser_struct_field_if.stderr index 51a11453..a999665a 100644 --- a/test_suite/tests/ui/with-variant/skip_ser_struct_field_if.stderr +++ b/test_suite/tests/ui/with-variant/skip_ser_struct_field_if.stderr @@ -1,12 +1,12 @@ error: variant `Struct` cannot have both #[serde(serialize_with)] and a field `f1` marked with #[serde(skip_serializing_if)] - --> $DIR/skip_ser_struct_field_if.rs:6:5 + --> $DIR/skip_ser_struct_field_if.rs:5:5 | -6 | / #[serde(serialize_with = "serialize_some_newtype_variant")] -7 | | Struct { -8 | | #[serde(skip_serializing_if = "always")] -9 | | f1: String, -10 | | f2: u8, -11 | | }, +5 | / #[serde(serialize_with = "serialize_some_newtype_variant")] +6 | | Struct { +7 | | #[serde(skip_serializing_if = "always")] +8 | | f1: String, +9 | | f2: u8, +10 | | }, | |_____^ error: aborting due to previous error diff --git a/test_suite/tests/ui/with-variant/skip_ser_tuple_field.rs b/test_suite/tests/ui/with-variant/skip_ser_tuple_field.rs index 45af4994..23b43ac7 100644 --- a/test_suite/tests/ui/with-variant/skip_ser_tuple_field.rs +++ b/test_suite/tests/ui/with-variant/skip_ser_tuple_field.rs @@ -1,5 +1,4 @@ -#[macro_use] -extern crate serde_derive; +use serde_derive::Serialize; #[derive(Serialize)] enum Enum { diff --git a/test_suite/tests/ui/with-variant/skip_ser_tuple_field.stderr b/test_suite/tests/ui/with-variant/skip_ser_tuple_field.stderr index 1c61e322..828c4aaa 100644 --- a/test_suite/tests/ui/with-variant/skip_ser_tuple_field.stderr +++ b/test_suite/tests/ui/with-variant/skip_ser_tuple_field.stderr @@ -1,8 +1,8 @@ error: variant `Tuple` cannot have both #[serde(serialize_with)] and a field #0 marked with #[serde(skip_serializing)] - --> $DIR/skip_ser_tuple_field.rs:6:5 + --> $DIR/skip_ser_tuple_field.rs:5:5 | -6 | / #[serde(serialize_with = "serialize_some_other_variant")] -7 | | Tuple(#[serde(skip_serializing)] String, u8), +5 | / #[serde(serialize_with = "serialize_some_other_variant")] +6 | | Tuple(#[serde(skip_serializing)] String, u8), | |________________________________________________^ error: aborting due to previous error diff --git a/test_suite/tests/ui/with-variant/skip_ser_tuple_field_if.rs b/test_suite/tests/ui/with-variant/skip_ser_tuple_field_if.rs index 66021954..64eab052 100644 --- a/test_suite/tests/ui/with-variant/skip_ser_tuple_field_if.rs +++ b/test_suite/tests/ui/with-variant/skip_ser_tuple_field_if.rs @@ -1,5 +1,4 @@ -#[macro_use] -extern crate serde_derive; +use serde_derive::Serialize; #[derive(Serialize)] enum Enum { diff --git a/test_suite/tests/ui/with-variant/skip_ser_tuple_field_if.stderr b/test_suite/tests/ui/with-variant/skip_ser_tuple_field_if.stderr index b701364f..f8380115 100644 --- a/test_suite/tests/ui/with-variant/skip_ser_tuple_field_if.stderr +++ b/test_suite/tests/ui/with-variant/skip_ser_tuple_field_if.stderr @@ -1,8 +1,8 @@ error: variant `Tuple` cannot have both #[serde(serialize_with)] and a field #0 marked with #[serde(skip_serializing_if)] - --> $DIR/skip_ser_tuple_field_if.rs:6:5 + --> $DIR/skip_ser_tuple_field_if.rs:5:5 | -6 | / #[serde(serialize_with = "serialize_some_other_variant")] -7 | | Tuple(#[serde(skip_serializing_if = "always")] String, u8), +5 | / #[serde(serialize_with = "serialize_some_other_variant")] +6 | | Tuple(#[serde(skip_serializing_if = "always")] String, u8), | |______________________________________________________________^ error: aborting due to previous error diff --git a/test_suite/tests/ui/with-variant/skip_ser_whole_variant.rs b/test_suite/tests/ui/with-variant/skip_ser_whole_variant.rs index d140c925..1f7cf740 100644 --- a/test_suite/tests/ui/with-variant/skip_ser_whole_variant.rs +++ b/test_suite/tests/ui/with-variant/skip_ser_whole_variant.rs @@ -1,5 +1,4 @@ -#[macro_use] -extern crate serde_derive; +use serde_derive::Serialize; #[derive(Serialize)] enum Enum { diff --git a/test_suite/tests/ui/with-variant/skip_ser_whole_variant.stderr b/test_suite/tests/ui/with-variant/skip_ser_whole_variant.stderr index 07bd27dc..5b3f7477 100644 --- a/test_suite/tests/ui/with-variant/skip_ser_whole_variant.stderr +++ b/test_suite/tests/ui/with-variant/skip_ser_whole_variant.stderr @@ -1,9 +1,9 @@ error: variant `Unit` cannot have both #[serde(serialize_with)] and #[serde(skip_serializing)] - --> $DIR/skip_ser_whole_variant.rs:6:5 + --> $DIR/skip_ser_whole_variant.rs:5:5 | -6 | / #[serde(serialize_with = "serialize_some_unit_variant")] -7 | | #[serde(skip_serializing)] -8 | | Unit, +5 | / #[serde(serialize_with = "serialize_some_unit_variant")] +6 | | #[serde(skip_serializing)] +7 | | Unit, | |________^ error: aborting due to previous error