Fix a bad merge

src/de.rs

@@ -1825,13 +1825,6 @@ impl Error {
         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) -> ()
     where
         F: FnOnce() -> Option<usize>,
@@ -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 {