asya/toml-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix a bad merge

Browse source
This commit is contained in:
Alex Crichton 2019-08-12 13:50:44 -07:00
parent 7a11ed691a
commit 59c0d52600
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/de.rs
View file

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