From 47efbc6d758e50cc9c1ead8e002352def4e7c1a4 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Sat, 25 Feb 2017 11:31:00 -0800
Subject: [PATCH] Don't need to pass back the input here

---
 serde_codegen_internals/src/attr.rs | 12 ++++++------
 serde_codegen_internals/src/case.rs |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/serde_codegen_internals/src/attr.rs b/serde_codegen_internals/src/attr.rs
index 461907a8..92a183c4 100644
--- a/serde_codegen_internals/src/attr.rs
+++ b/serde_codegen_internals/src/attr.rs
@@ -168,12 +168,12 @@ impl Item {
                     // Parse `#[serde(rename_all="foo")]`
                     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) {
-                            match RenameRule::from_str(s.as_str()) {
+                            match RenameRule::from_str(&s) {
                                 Ok(rename_rule) => rename_all.set(rename_rule),
-                                Err(other) => {
+                                Err(()) => {
                                     cx.error(format!("unknown rename rule for #[serde(rename_all \
                                                       = {:?})]",
-                                                     other))
+                                                     s))
                                 }
                             }
                         }
@@ -412,12 +412,12 @@ impl Variant {
                     // Parse `#[serde(rename_all="foo")]`
                     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) {
-                            match RenameRule::from_str(s.as_str()) {
+                            match RenameRule::from_str(&s) {
                                 Ok(rename_rule) => rename_all.set(rename_rule),
-                                Err(other) => {
+                                Err(()) => {
                                     cx.error(format!("unknown rename rule for #[serde(rename_all \
                                                       = {:?})]",
-                                                     other))
+                                                     s))
                                 }
                             }
                         }
diff --git a/serde_codegen_internals/src/case.rs b/serde_codegen_internals/src/case.rs
index 6351b6f3..d25d98df 100644
--- a/serde_codegen_internals/src/case.rs
+++ b/serde_codegen_internals/src/case.rs
@@ -68,7 +68,7 @@ impl RenameRule {
 }
 
 impl FromStr for RenameRule {
-    type Err = String;
+    type Err = ();
 
     fn from_str(rename_all_str: &str) -> Result<Self, Self::Err> {
         match rename_all_str {
@@ -77,7 +77,7 @@ impl FromStr for RenameRule {
             "snake_case" => Ok(SnakeCase),
             "SCREAMING_SNAKE_CASE" => Ok(ScreamingSnakeCase),
             "kebab-case" => Ok(KebabCase),
-            other => Err(other.to_string()),
+            _ => Err(()),
         }
     }
 }