From fbcb2230bb95ae93e9d5f14a43bae84b91519dde Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Sat, 23 Jan 2021 22:57:09 -0800
Subject: [PATCH] Make use of fmt::Result type alias from libcore

---
 serde/src/de/mod.rs   | 2 +-
 serde/src/de/value.rs | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/serde/src/de/mod.rs b/serde/src/de/mod.rs
index 6d394736..375d4b42 100644
--- a/serde/src/de/mod.rs
+++ b/serde/src/de/mod.rs
@@ -393,7 +393,7 @@ pub enum Unexpected<'a> {
 }
 
 impl<'a> fmt::Display for Unexpected<'a> {
-    fn fmt(&self, formatter: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
         use self::Unexpected::*;
         match *self {
             Bool(b) => write!(formatter, "boolean `{}`", b),
diff --git a/serde/src/de/value.rs b/serde/src/de/value.rs
index 207f93e3..65ffe083 100644
--- a/serde/src/de/value.rs
+++ b/serde/src/de/value.rs
@@ -93,18 +93,18 @@ impl ser::Error for Error {
 
 impl Display for Error {
     #[cfg(any(feature = "std", feature = "alloc"))]
-    fn fmt(&self, formatter: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
         formatter.write_str(&self.err)
     }
 
     #[cfg(not(any(feature = "std", feature = "alloc")))]
-    fn fmt(&self, formatter: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
         formatter.write_str("Serde deserialization error")
     }
 }
 
 impl Debug for Error {
-    fn fmt(&self, formatter: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
         let mut debug = formatter.debug_tuple("Error");
         #[cfg(any(feature = "std", feature = "alloc"))]
         debug.field(&self.err);