From 7d1d4243318d66c8f68d63bcf60927f7b342d830 Mon Sep 17 00:00:00 2001
From: Daniel Mason <daniel@danielmason.com>
Date: Mon, 11 May 2020 12:33:16 +0100
Subject: [PATCH 1/5] style: redundant closure when function call takes same
 arguments

---
 src/ser/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ser/mod.rs b/src/ser/mod.rs
index 4e21fb8..d67146b 100644
--- a/src/ser/mod.rs
+++ b/src/ser/mod.rs
@@ -478,7 +478,7 @@ where
         value: &T,
     ) -> Result<(), Error> {
         {
-            let key = self.key.as_ref().ok_or_else(|| Error::no_key())?;
+            let key = self.key.as_ref().ok_or_else(Error::no_key)?;
             let value_sink = value::ValueSink::new(self.urlencoder, &key);
             value.serialize(part::PartSerializer::new(value_sink))?;
         }

From 883590eb5ecf5a2804a3aa89a2e74efb8630fd15 Mon Sep 17 00:00:00 2001
From: Daniel Mason <daniel@danielmason.com>
Date: Mon, 11 May 2020 12:34:18 +0100
Subject: [PATCH 2/5] style: variant and name are already &'static str, no need
 to `.into()`

---
 src/ser/part.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ser/part.rs b/src/ser/part.rs
index f72846c..7e7e72b 100644
--- a/src/ser/part.rs
+++ b/src/ser/part.rs
@@ -110,7 +110,7 @@ impl<S: Sink> ser::Serializer for PartSerializer<S> {
     }
 
     fn serialize_unit_struct(self, name: &'static str) -> Result<S::Ok, Error> {
-        self.sink.serialize_static_str(name.into())
+        self.sink.serialize_static_str(name)
     }
 
     fn serialize_unit_variant(
@@ -119,7 +119,7 @@ impl<S: Sink> ser::Serializer for PartSerializer<S> {
         _variant_index: u32,
         variant: &'static str,
     ) -> Result<S::Ok, Error> {
-        self.sink.serialize_static_str(variant.into())
+        self.sink.serialize_static_str(variant)
     }
 
     fn serialize_newtype_struct<T: ?Sized + ser::Serialize>(

From d8817041dd7f5046e0f00ad498c42307bd80392a Mon Sep 17 00:00:00 2001
From: Daniel Mason <daniel@danielmason.com>
Date: Mon, 11 May 2020 12:36:31 +0100
Subject: [PATCH 3/5] style: remove redundant key names

---
 src/ser/key.rs   | 2 +-
 src/ser/mod.rs   | 2 +-
 src/ser/pair.rs  | 4 ++--
 src/ser/part.rs  | 2 +-
 src/ser/value.rs | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/ser/key.rs b/src/ser/key.rs
index 2a2e63a..a34b64c 100644
--- a/src/ser/key.rs
+++ b/src/ser/key.rs
@@ -38,7 +38,7 @@ where
     End: for<'key> FnOnce(Key<'key>) -> Result<Ok, Error>,
 {
     pub fn new(end: End) -> Self {
-        KeySink { end: end }
+        KeySink { end }
     }
 }
 
diff --git a/src/ser/mod.rs b/src/ser/mod.rs
index d67146b..18882a6 100644
--- a/src/ser/mod.rs
+++ b/src/ser/mod.rs
@@ -50,7 +50,7 @@ impl<'input, 'output, Target: 'output + UrlEncodedTarget> Serializer<'input, 'ou
     /// Returns a new `Serializer`.
     pub fn new(urlencoder: &'output mut UrlEncodedSerializer<'input, Target>) -> Self {
         Serializer {
-            urlencoder: urlencoder,
+            urlencoder,
         }
     }
 }
diff --git a/src/ser/pair.rs b/src/ser/pair.rs
index e7235e4..8a231d6 100644
--- a/src/ser/pair.rs
+++ b/src/ser/pair.rs
@@ -19,7 +19,7 @@ where
 {
     pub fn new(urlencoder: &'target mut UrlEncodedSerializer<'input, Target>) -> Self {
         PairSerializer {
-            urlencoder: urlencoder,
+            urlencoder,
             state: PairState::WaitingForKey,
         }
     }
@@ -229,7 +229,7 @@ where
                 if result.is_ok() {
                     self.state = PairState::Done;
                 } else {
-                    self.state = PairState::WaitingForValue { key: key };
+                    self.state = PairState::WaitingForValue { key };
                 }
                 result
             },
diff --git a/src/ser/part.rs b/src/ser/part.rs
index 7e7e72b..fc54afc 100644
--- a/src/ser/part.rs
+++ b/src/ser/part.rs
@@ -10,7 +10,7 @@ pub struct PartSerializer<S> {
 
 impl<S: Sink> PartSerializer<S> {
     pub fn new(sink: S) -> Self {
-        PartSerializer { sink: sink }
+        PartSerializer { sink }
     }
 }
 
diff --git a/src/ser/value.rs b/src/ser/value.rs
index fc12076..c3e2ddf 100644
--- a/src/ser/value.rs
+++ b/src/ser/value.rs
@@ -22,8 +22,8 @@ where
         key: &'key str,
     ) -> Self {
         ValueSink {
-            urlencoder: urlencoder,
-            key: key,
+            urlencoder,
+            key,
         }
     }
 }

From 9d615cc7404b4abd7d61e45bfdea3c4eec5902af Mon Sep 17 00:00:00 2001
From: Daniel Mason <daniel@danielmason.com>
Date: Tue, 12 May 2020 10:03:38 +0100
Subject: [PATCH 4/5] fix: allow deprecated on error description

---
 src/ser/mod.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ser/mod.rs b/src/ser/mod.rs
index 18882a6..1a9b6da 100644
--- a/src/ser/mod.rs
+++ b/src/ser/mod.rs
@@ -72,6 +72,7 @@ impl fmt::Display for Error {
 }
 
 impl error::Error for Error {
+    #[allow(deprecated)]
     fn description(&self) -> &str {
         match *self {
             Error::Custom(ref msg) => msg,

From 122a5165f90cabb94a51c6ee6037d1afd0060634 Mon Sep 17 00:00:00 2001
From: Daniel Mason <daniel@danielmason.com>
Date: Tue, 12 May 2020 10:04:15 +0100
Subject: [PATCH 5/5] fix: add dyn to reference

---
 src/ser/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ser/mod.rs b/src/ser/mod.rs
index 1a9b6da..731e1ed 100644
--- a/src/ser/mod.rs
+++ b/src/ser/mod.rs
@@ -81,7 +81,7 @@ impl error::Error for Error {
     }
 
     /// The lower-level cause of this error, in the case of a `Utf8` error.
-    fn cause(&self) -> Option<&error::Error> {
+    fn cause(&self) -> Option<&dyn error::Error> {
         match *self {
             Error::Custom(_) => None,
             Error::Utf8(ref err) => Some(err),