pezkuwichain/serde
1
0
Fork 0
mirror of https://github.com/pezkuwichain/serde.git synced 2026-06-13 02:01:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add error type to use for RenameRule parsing

Browse Source
This commit is contained in:
David Tolnay
2021-01-23 14:09:58 -08:00
parent ed04824f10
commit 7db0982e58
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serde_derive/src/internals/attr.rs
+6 -6
View File
@@ -339,7 +339,7 @@ impl Container {
rename_all_ser_rule.set(&m.path, rename_rule); rename_all_ser_rule.set(&m.path, rename_rule);
rename_all_de_rule.set(&m.path, rename_rule); rename_all_de_rule.set(&m.path, rename_rule);
} }
Err(()) => cx.error_spanned_by( Err(_err) => cx.error_spanned_by(
s, s,
format!( format!(
"unknown rename rule for #[serde(rename_all = {:?})]", "unknown rename rule for #[serde(rename_all = {:?})]",
@@ -356,7 +356,7 @@ impl Container {
if let Some(ser) = ser { if let Some(ser) = ser {
match RenameRule::from_str(&ser.value()) { match RenameRule::from_str(&ser.value()) {
Ok(rename_rule) => rename_all_ser_rule.set(&m.path, rename_rule), Ok(rename_rule) => rename_all_ser_rule.set(&m.path, rename_rule),
Err(()) => cx.error_spanned_by( Err(_err) => cx.error_spanned_by(
ser, ser,
format!( format!(
"unknown rename rule for #[serde(rename_all = {:?})]", "unknown rename rule for #[serde(rename_all = {:?})]",
@@ -368,7 +368,7 @@ impl Container {
if let Some(de) = de { if let Some(de) = de {
match RenameRule::from_str(&de.value()) { match RenameRule::from_str(&de.value()) {
Ok(rename_rule) => rename_all_de_rule.set(&m.path, rename_rule), Ok(rename_rule) => rename_all_de_rule.set(&m.path, rename_rule),
Err(()) => cx.error_spanned_by( Err(_err) => cx.error_spanned_by(
de, de,
format!( format!(
"unknown rename rule for #[serde(rename_all = {:?})]", "unknown rename rule for #[serde(rename_all = {:?})]",
@@ -930,7 +930,7 @@ impl Variant {
rename_all_ser_rule.set(&m.path, rename_rule); rename_all_ser_rule.set(&m.path, rename_rule);
rename_all_de_rule.set(&m.path, rename_rule); rename_all_de_rule.set(&m.path, rename_rule);
} }
Err(()) => cx.error_spanned_by( Err(_err) => cx.error_spanned_by(
s, s,
format!( format!(
"unknown rename rule for #[serde(rename_all = {:?})]", "unknown rename rule for #[serde(rename_all = {:?})]",
@@ -947,7 +947,7 @@ impl Variant {
if let Some(ser) = ser { if let Some(ser) = ser {
match RenameRule::from_str(&ser.value()) { match RenameRule::from_str(&ser.value()) {
Ok(rename_rule) => rename_all_ser_rule.set(&m.path, rename_rule), Ok(rename_rule) => rename_all_ser_rule.set(&m.path, rename_rule),
Err(()) => cx.error_spanned_by( Err(_err) => cx.error_spanned_by(
ser, ser,
format!( format!(
"unknown rename rule for #[serde(rename_all = {:?})]", "unknown rename rule for #[serde(rename_all = {:?})]",
@@ -959,7 +959,7 @@ impl Variant {
if let Some(de) = de { if let Some(de) = de {
match RenameRule::from_str(&de.value()) { match RenameRule::from_str(&de.value()) {
Ok(rename_rule) => rename_all_de_rule.set(&m.path, rename_rule), Ok(rename_rule) => rename_all_de_rule.set(&m.path, rename_rule),
Err(()) => cx.error_spanned_by( Err(_err) => cx.error_spanned_by(
de, de,
format!( format!(
"unknown rename rule for #[serde(rename_all = {:?})]", "unknown rename rule for #[serde(rename_all = {:?})]",
serde_derive/src/internals/case.rs
+6 -2
View File
@@ -34,7 +34,7 @@ pub enum RenameRule {
} }
impl RenameRule { impl RenameRule {
pub fn from_str(rename_all_str: &str) -> Result<Self, ()> { pub fn from_str(rename_all_str: &str) -> Result<Self, ParseError> {
match rename_all_str { match rename_all_str {
"lowercase" => Ok(LowerCase), "lowercase" => Ok(LowerCase),
"UPPERCASE" => Ok(UPPERCASE), "UPPERCASE" => Ok(UPPERCASE),
@@ -44,7 +44,7 @@ impl RenameRule {
"SCREAMING_SNAKE_CASE" => Ok(ScreamingSnakeCase), "SCREAMING_SNAKE_CASE" => Ok(ScreamingSnakeCase),
"kebab-case" => Ok(KebabCase), "kebab-case" => Ok(KebabCase),
"SCREAMING-KEBAB-CASE" => Ok(ScreamingKebabCase), "SCREAMING-KEBAB-CASE" => Ok(ScreamingKebabCase),
_ => Err(()), unknown => Err(ParseError { unknown }),
} }
} }
@@ -104,6 +104,10 @@ impl RenameRule {
} }
} }
pub struct ParseError<'a> {
unknown: &'a str,
}
#[test] #[test]
fn rename_variants() { fn rename_variants() {
for &(original, lower, upper, camel, snake, screaming, kebab, screaming_kebab) in &[ for &(original, lower, upper, camel, snake, screaming, kebab, screaming_kebab) in &[