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

Don't need to pass back the input here

Browse Source
This commit is contained in:
David Tolnay
2017-02-25 11:31:00 -08:00
parent 17279e8a4f
commit 47efbc6d75
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serde_codegen_internals/src/attr.rs
+6 -6
View File
@@ -168,12 +168,12 @@ impl Item {
// Parse `#[serde(rename_all="foo")]` // Parse `#[serde(rename_all="foo")]`
MetaItem(NameValue(ref name, ref lit)) if name == "rename_all" => { MetaItem(NameValue(ref name, ref lit)) if name == "rename_all" => {
if let Ok(s) = get_string_from_lit(cx, name.as_ref(), name.as_ref(), lit) { if let Ok(s) = get_string_from_lit(cx, name.as_ref(), name.as_ref(), lit) {
match RenameRule::from_str(s.as_str()) { match RenameRule::from_str(&s) {
Ok(rename_rule) => rename_all.set(rename_rule), Ok(rename_rule) => rename_all.set(rename_rule),
Err(other) => { Err(()) => {
cx.error(format!("unknown rename rule for #[serde(rename_all \ cx.error(format!("unknown rename rule for #[serde(rename_all \
= {:?})]", = {:?})]",
other)) s))
} }
} }
} }
@@ -412,12 +412,12 @@ impl Variant {
// Parse `#[serde(rename_all="foo")]` // Parse `#[serde(rename_all="foo")]`
MetaItem(NameValue(ref name, ref lit)) if name == "rename_all" => { MetaItem(NameValue(ref name, ref lit)) if name == "rename_all" => {
if let Ok(s) = get_string_from_lit(cx, name.as_ref(), name.as_ref(), lit) { if let Ok(s) = get_string_from_lit(cx, name.as_ref(), name.as_ref(), lit) {
match RenameRule::from_str(s.as_str()) { match RenameRule::from_str(&s) {
Ok(rename_rule) => rename_all.set(rename_rule), Ok(rename_rule) => rename_all.set(rename_rule),
Err(other) => { Err(()) => {
cx.error(format!("unknown rename rule for #[serde(rename_all \ cx.error(format!("unknown rename rule for #[serde(rename_all \
= {:?})]", = {:?})]",
other)) s))
} }
} }
} }
serde_codegen_internals/src/case.rs
+2 -2
View File
@@ -68,7 +68,7 @@ impl RenameRule {
} }
impl FromStr for RenameRule { impl FromStr for RenameRule {
type Err = String; type Err = ();
fn from_str(rename_all_str: &str) -> Result<Self, Self::Err> { fn from_str(rename_all_str: &str) -> Result<Self, Self::Err> {
match rename_all_str { match rename_all_str {
@@ -77,7 +77,7 @@ impl FromStr for RenameRule {
"snake_case" => Ok(SnakeCase), "snake_case" => Ok(SnakeCase),
"SCREAMING_SNAKE_CASE" => Ok(ScreamingSnakeCase), "SCREAMING_SNAKE_CASE" => Ok(ScreamingSnakeCase),
"kebab-case" => Ok(KebabCase), "kebab-case" => Ok(KebabCase),
other => Err(other.to_string()), _ => Err(()),
} }
} }
} }