mikros/serde
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Un-wrap error message strings for better grepping

Browse Source
This commit is contained in:
David Tolnay 2019-09-07 22:39:50 -07:00
parent b86a46c83c
commit 7ab12597bb
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82
2 changed files with 22 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
serde_derive/src/internals/attr.rs
View File

@ -335,8 +335,7 @@ impl Container {
Err(()) => cx.error_spanned_by( Err(()) => cx.error_spanned_by(
s, s,
format!( format!(
"unknown rename rule for #[serde(rename_all \ "unknown rename rule for #[serde(rename_all = {:?})]",
= {:?})]",
s.value(), s.value(),
), ),
), ),
@ -355,8 +354,7 @@ impl Container {
Err(()) => cx.error_spanned_by( Err(()) => cx.error_spanned_by(
ser, ser,
format!( format!(
"unknown rename rule for #[serde(rename_all \ "unknown rename rule for #[serde(rename_all = {:?})]",
= {:?})]",
ser.value(), ser.value(),
), ),
), ),
@ -368,8 +366,7 @@ impl Container {
Err(()) => cx.error_spanned_by( Err(()) => cx.error_spanned_by(
de, de,
format!( format!(
"unknown rename rule for #[serde(rename_all \ "unknown rename rule for #[serde(rename_all = {:?})]",
= {:?})]",
de.value(), de.value(),
), ),
), ),
@ -396,22 +393,19 @@ impl Container {
} }
syn::Fields::Unnamed(_) | syn::Fields::Unit => cx.error_spanned_by( syn::Fields::Unnamed(_) | syn::Fields::Unit => cx.error_spanned_by(
fields, fields,
"#[serde(default)] can only be used on structs \ "#[serde(default)] can only be used on structs with named fields",
with named fields",
), ),
}, },
syn::Data::Enum(syn::DataEnum { ref enum_token, .. }) => cx syn::Data::Enum(syn::DataEnum { ref enum_token, .. }) => cx
.error_spanned_by( .error_spanned_by(
enum_token, enum_token,
"#[serde(default)] can only be used on structs \ "#[serde(default)] can only be used on structs with named fields",
with named fields",
), ),
syn::Data::Union(syn::DataUnion { syn::Data::Union(syn::DataUnion {
ref union_token, .. ref union_token, ..
}) => cx.error_spanned_by( }) => cx.error_spanned_by(
union_token, union_token,
"#[serde(default)] can only be used on structs \ "#[serde(default)] can only be used on structs with named fields",
with named fields",
), ),
}, },
@ -427,23 +421,20 @@ impl Container {
syn::Fields::Unnamed(_) | syn::Fields::Unit => cx syn::Fields::Unnamed(_) | syn::Fields::Unit => cx
.error_spanned_by( .error_spanned_by(
fields, fields,
"#[serde(default = \"...\")] can only be used \ "#[serde(default = \"...\")] can only be used on structs with named fields",
on structs with named fields",
), ),
} }
} }
syn::Data::Enum(syn::DataEnum { ref enum_token, .. }) => cx syn::Data::Enum(syn::DataEnum { ref enum_token, .. }) => cx
.error_spanned_by( .error_spanned_by(
enum_token, enum_token,
"#[serde(default = \"...\")] can only be used \ "#[serde(default = \"...\")] can only be used on structs with named fields",
on structs with named fields",
), ),
syn::Data::Union(syn::DataUnion { syn::Data::Union(syn::DataUnion {
ref union_token, .. ref union_token, ..
}) => cx.error_spanned_by( }) => cx.error_spanned_by(
union_token, union_token,
"#[serde(default = \"...\")] can only be used \ "#[serde(default = \"...\")] can only be used on structs with named fields",
on structs with named fields",
), ),
} }
} }
@ -504,8 +495,7 @@ impl Container {
syn::Fields::Unnamed(_) | syn::Fields::Unit => { syn::Fields::Unnamed(_) | syn::Fields::Unit => {
cx.error_spanned_by( cx.error_spanned_by(
fields, fields,
"#[serde(tag = \"...\")] can only be used on enums \ "#[serde(tag = \"...\")] can only be used on enums and structs with named fields",
and structs with named fields",
); );
} }
} }
@ -515,8 +505,7 @@ impl Container {
}) => { }) => {
cx.error_spanned_by( cx.error_spanned_by(
union_token, union_token,
"#[serde(tag = \"...\")] can only be used on enums \ "#[serde(tag = \"...\")] can only be used on enums and structs with named fields",
and structs with named fields",
); );
} }
} }
@ -734,8 +723,7 @@ fn decide_tag(
if fields.unnamed.len() != 1 { if fields.unnamed.len() != 1 {
cx.error_spanned_by( cx.error_spanned_by(
variant, variant,
"#[serde(tag = \"...\")] cannot be used with tuple \ "#[serde(tag = \"...\")] cannot be used with tuple variants",
variants",
); );
break; break;
} }
@ -947,8 +935,7 @@ impl Variant {
Err(()) => cx.error_spanned_by( Err(()) => cx.error_spanned_by(
s, s,
format!( format!(
"unknown rename rule for #[serde(rename_all \ "unknown rename rule for #[serde(rename_all = {:?})]",
= {:?})]",
s.value() s.value()
), ),
), ),
@ -967,8 +954,7 @@ impl Variant {
Err(()) => cx.error_spanned_by( Err(()) => cx.error_spanned_by(
ser, ser,
format!( format!(
"unknown rename rule for #[serde(rename_all \ "unknown rename rule for #[serde(rename_all = {:?})]",
= {:?})]",
ser.value(), ser.value(),
), ),
), ),
@ -980,8 +966,7 @@ impl Variant {
Err(()) => cx.error_spanned_by( Err(()) => cx.error_spanned_by(
de, de,
format!( format!(
"unknown rename rule for #[serde(rename_all \ "unknown rename rule for #[serde(rename_all = {:?})]",
= {:?})]",
de.value(), de.value(),
), ),
), ),
@ -1587,8 +1572,7 @@ where
cx.error_spanned_by( cx.error_spanned_by(
meta, meta,
format!( format!(
"malformed {0} attribute, expected `{0}(serialize = ..., \ "malformed {0} attribute, expected `{0}(serialize = ..., deserialize = ...)`",
deserialize = ...)`",
attr_name attr_name
), ),
); );

18
serde_derive/src/internals/check.rs
View File

@ -32,8 +32,7 @@ fn check_getter(cx: &Ctxt, cont: &Container) {
if cont.data.has_getter() && cont.attrs.remote().is_none() { if cont.data.has_getter() && cont.attrs.remote().is_none() {
cx.error_spanned_by( cx.error_spanned_by(
cont.original, cont.original,
"#[serde(getter = \"...\")] can only be used in structs \ "#[serde(getter = \"...\")] can only be used in structs that have #[serde(remote = \"...\")]",
that have #[serde(remote = \"...\")]",
); );
} }
} }
@ -183,8 +182,7 @@ fn check_variant_skip_attrs(cx: &Ctxt, cont: &Container) {
cx.error_spanned_by( cx.error_spanned_by(
variant.original, variant.original,
format!( format!(
"variant `{}` cannot have both #[serde(serialize_with)] and \ "variant `{}` cannot have both #[serde(serialize_with)] and #[serde(skip_serializing)]",
#[serde(skip_serializing)]",
variant.ident variant.ident
), ),
); );
@ -197,8 +195,7 @@ fn check_variant_skip_attrs(cx: &Ctxt, cont: &Container) {
cx.error_spanned_by( cx.error_spanned_by(
variant.original, variant.original,
format!( format!(
"variant `{}` cannot have both #[serde(serialize_with)] and \ "variant `{}` cannot have both #[serde(serialize_with)] and a field {} marked with #[serde(skip_serializing)]",
a field {} marked with #[serde(skip_serializing)]",
variant.ident, member variant.ident, member
), ),
); );
@ -208,8 +205,7 @@ fn check_variant_skip_attrs(cx: &Ctxt, cont: &Container) {
cx.error_spanned_by( cx.error_spanned_by(
variant.original, variant.original,
format!( format!(
"variant `{}` cannot have both #[serde(serialize_with)] and \ "variant `{}` cannot have both #[serde(serialize_with)] and a field {} marked with #[serde(skip_serializing_if)]",
a field {} marked with #[serde(skip_serializing_if)]",
variant.ident, member variant.ident, member
), ),
); );
@ -222,8 +218,7 @@ fn check_variant_skip_attrs(cx: &Ctxt, cont: &Container) {
cx.error_spanned_by( cx.error_spanned_by(
variant.original, variant.original,
format!( format!(
"variant `{}` cannot have both #[serde(deserialize_with)] and \ "variant `{}` cannot have both #[serde(deserialize_with)] and #[serde(skip_deserializing)]",
#[serde(skip_deserializing)]",
variant.ident variant.ident
), ),
); );
@ -236,8 +231,7 @@ fn check_variant_skip_attrs(cx: &Ctxt, cont: &Container) {
cx.error_spanned_by( cx.error_spanned_by(
variant.original, variant.original,
format!( format!(
"variant `{}` cannot have both #[serde(deserialize_with)] \ "variant `{}` cannot have both #[serde(deserialize_with)] and a field {} marked with #[serde(skip_deserializing)]",
and a field {} marked with #[serde(skip_deserializing)]",
variant.ident, member variant.ident, member
), ),
); );