Skip to content

Commit

Permalink
Update error span for attribute / data kind mismatches
Browse files Browse the repository at this point in the history
  • Loading branch information
@jplatte
jplatte committed Jul 27, 2023
1 parent 74fe708 commit 31a0e73
Show file tree
Hide file tree
Showing 7 changed files with 40 additions and 42 deletions.
44 changes: 22 additions & 22 deletions serde_derive/src/internals/attr.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -386,11 +386,11 @@ impl Container {
}
syn::Data::Struct(_) => {
let msg = "#[serde(rename_all_fields)] can only be used on enums";
cx.error_spanned_by(&meta.path, msg);
cx.syn_error(meta.error(msg));
}
syn::Data::Union(_) => {
let msg = "#[serde(rename_all_fields)] can only be used on enums";
cx.error_spanned_by(&meta.path, msg);
cx.syn_error(meta.error(msg));
}
}
} else if meta.path == TRANSPARENT {
Expand All @@ -410,16 +410,16 @@ impl Container {
}
syn::Fields::Unnamed(_) | syn::Fields::Unit => {
let msg = "#[serde(default = \"...\")] can only be used on structs with named fields";
cx.error_spanned_by(fields, msg);
cx.syn_error(meta.error(msg));
}
},
syn::Data::Enum(syn::DataEnum { enum_token, .. }) => {
syn::Data::Enum(_) => {
let msg = "#[serde(default = \"...\")] can only be used on structs with named fields";
cx.error_spanned_by(enum_token, msg);
cx.syn_error(meta.error(msg));
}
syn::Data::Union(syn::DataUnion { union_token, .. }) => {
syn::Data::Union(_) => {
let msg = "#[serde(default = \"...\")] can only be used on structs with named fields";
cx.error_spanned_by(union_token, msg);
cx.syn_error(meta.error(msg));
}
}
}
Expand All @@ -435,13 +435,13 @@ impl Container {
cx.error_spanned_by(fields, msg);
}
},
syn::Data::Enum(syn::DataEnum { enum_token, .. }) => {
syn::Data::Enum(_) => {
let msg = "#[serde(default)] can only be used on structs with named fields";
cx.error_spanned_by(enum_token, msg);
cx.syn_error(meta.error(msg));
}
syn::Data::Union(syn::DataUnion { union_token, .. }) => {
syn::Data::Union(_) => {
let msg = "#[serde(default)] can only be used on structs with named fields";
cx.error_spanned_by(union_token, msg);
cx.syn_error(meta.error(msg));
}
}
}
Expand All @@ -457,13 +457,13 @@ impl Container {
syn::Data::Enum(_) => {
untagged.set_true(&meta.path);
}
syn::Data::Struct(syn::DataStruct { struct_token, .. }) => {
syn::Data::Struct(_) => {
let msg = "#[serde(untagged)] can only be used on enums";
cx.error_spanned_by(struct_token, msg);
cx.syn_error(meta.error(msg));
}
syn::Data::Union(syn::DataUnion { union_token, .. }) => {
syn::Data::Union(_) => {
let msg = "#[serde(untagged)] can only be used on enums";
cx.error_spanned_by(union_token, msg);
cx.syn_error(meta.error(msg));
}
}
} else if meta.path == TAG {
Expand All @@ -479,12 +479,12 @@ impl Container {
}
syn::Fields::Unnamed(_) | syn::Fields::Unit => {
let msg = "#[serde(tag = \"...\")] can only be used on enums and structs with named fields";
cx.error_spanned_by(fields, msg);
cx.syn_error(meta.error(msg));
}
},
syn::Data::Union(syn::DataUnion { union_token, .. }) => {
syn::Data::Union(_) => {
let msg = "#[serde(tag = \"...\")] can only be used on enums and structs with named fields";
cx.error_spanned_by(union_token, msg);
cx.syn_error(meta.error(msg));
}
}
}
Expand All @@ -495,13 +495,13 @@ impl Container {
syn::Data::Enum(_) => {
content.set(&meta.path, s.value());
}
syn::Data::Struct(syn::DataStruct { struct_token, .. }) => {
syn::Data::Struct(_) => {
let msg = "#[serde(content = \"...\")] can only be used on enums";
cx.error_spanned_by(struct_token, msg);
cx.syn_error(meta.error(msg));
}
syn::Data::Union(syn::DataUnion { union_token, .. }) => {
syn::Data::Union(_) => {
let msg = "#[serde(content = \"...\")] can only be used on enums";
cx.error_spanned_by(union_token, msg);
cx.syn_error(meta.error(msg));
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions test_suite/tests/ui/default-attribute/enum.stderr
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error: #[serde(default)] can only be used on structs with named fields
--> tests/ui/default-attribute/enum.rs:5:1
--> tests/ui/default-attribute/enum.rs:4:9
|
5 | enum E {
| ^^^^
4 | #[serde(default)]
| ^^^^^^^
6 changes: 3 additions & 3 deletions test_suite/tests/ui/default-attribute/enum_path.stderr
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error: #[serde(default = "...")] can only be used on structs with named fields
--> tests/ui/default-attribute/enum_path.rs:5:1
--> tests/ui/default-attribute/enum_path.rs:4:9
|
5 | enum E {
| ^^^^
4 | #[serde(default = "default_e")]
| ^^^^^^^^^^^^^^^^^^^^^
6 changes: 3 additions & 3 deletions test_suite/tests/ui/default-attribute/nameless_struct_fields_path.stderr
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error: #[serde(default = "...")] can only be used on structs with named fields
--> tests/ui/default-attribute/nameless_struct_fields_path.rs:5:9
--> tests/ui/default-attribute/nameless_struct_fields_path.rs:4:9
|
5 | struct T(u8, u8);
| ^^^^^^^^
4 | #[serde(default = "default_t")]
| ^^^^^^^^^^^^^^^^^^^^^
6 changes: 3 additions & 3 deletions test_suite/tests/ui/enum-representation/untagged-struct.stderr
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error: #[serde(untagged)] can only be used on enums
--> tests/ui/enum-representation/untagged-struct.rs:5:1
--> tests/ui/enum-representation/untagged-struct.rs:4:9
|
5 | struct S;
| ^^^^^^
4 | #[serde(untagged)]
| ^^^^^^^^
6 changes: 3 additions & 3 deletions test_suite/tests/ui/struct-representation/internally-tagged-tuple.stderr
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error: #[serde(tag = "...")] can only be used on enums and structs with named fields
--> tests/ui/struct-representation/internally-tagged-tuple.rs:5:9
--> tests/ui/struct-representation/internally-tagged-tuple.rs:4:9
|
5 | struct S(u8, u8);
| ^^^^^^^^
4 | #[serde(tag = "type")]
| ^^^^^^^^^^^^
8 changes: 3 additions & 5 deletions test_suite/tests/ui/struct-representation/internally-tagged-unit.stderr
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
error: #[serde(tag = "...")] can only be used on enums and structs with named fields
--> tests/ui/struct-representation/internally-tagged-unit.rs:3:10
--> tests/ui/struct-representation/internally-tagged-unit.rs:4:9
|
3 | #[derive(Serialize)]
| ^^^^^^^^^
|
= note: this error originates in the derive macro `Serialize` (in Nightly builds, run with -Z macro-backtrace for more info)
4 | #[serde(tag = "type")]
| ^^^^^^^^^^^^

0 comments on commit 31a0e73

Please sign in to comment.