Fix a bad merge
This commit is contained in:
parent
7a11ed691a
commit
59c0d52600
13
src/de.rs
13
src/de.rs
|
@ -1823,13 +1823,6 @@ impl Error {
|
||||||
#[doc(hidden)]
|
#[doc(hidden)]
|
||||||
pub fn add_key_context(&mut self, key: &str) {
|
pub fn add_key_context(&mut self, key: &str) {
|
||||||
self.inner.key.insert(0, key.to_string());
|
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) -> ()
|
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 {
|
impl fmt::Display for Error {
|
||||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||||
match self.inner.kind {
|
match self.inner.kind {
|
||||||
|
|
Loading…
Reference in a new issue