From 81cfc602b888edbe302eafd78d03bb7b99567cd1 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Mon, 12 Aug 2019 13:50:44 -0700
Subject: Fix a bad merge

---
 src/de.rs | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/de.rs b/src/de.rs
index 89b67d9..3c94467 100644
--- a/src/de.rs
+++ b/src/de.rs
@@ -1823,13 +1823,6 @@ impl Error {
     #[doc(hidden)]
     pub fn add_key_context(&mut self, key: &str) {
         self.inner.key.insert(0, key.to_string());
-    }    
-
-}
-
-impl std::convert::From<Error> for std::io::Error {
-    fn from(e: Error) -> Self {
-        return std::io::Error::new(std::io::ErrorKind::InvalidData, e.to_string())
     }
 
     fn fix_offset<F>(&mut self, f: F) -> ()
@@ -1855,6 +1848,12 @@ impl std::convert::From<Error> for std::io::Error {
     }
 }
 
+impl std::convert::From<Error> for std::io::Error {
+    fn from(e: Error) -> Self {
+        return std::io::Error::new(std::io::ErrorKind::InvalidData, e.to_string())
+    }
+}
+
 impl fmt::Display for Error {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self.inner.kind {
-- 
cgit v1.2.3