aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2019-08-12 15:35:55 -0500
committerGitHub <noreply@github.com>2019-08-12 15:35:55 -0500
commitc3a89a690aa34a4225126a40d30e9a0bf1f5a5a5 (patch)
tree4ee0ae6d0343f7709e62e75d09e82037bc16eefe /src
parent72881c2a06f9c51377d8a13f7d6bd0be36171b55 (diff)
parent27a2f490b3a88d41606be7fe9c3bc5880e3b55a8 (diff)
downloadmilf-rs-c3a89a690aa34a4225126a40d30e9a0bf1f5a5a5.tar.gz
milf-rs-c3a89a690aa34a4225126a40d30e9a0bf1f5a5a5.zip
Merge pull request #315 from jwdeitch/master
Allow conversion from de::Error to std::io::error
Diffstat (limited to 'src')
-rw-r--r--src/de.rs7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/de.rs b/src/de.rs
index 0b7b2cc..89b67d9 100644
--- a/src/de.rs
+++ b/src/de.rs
@@ -1823,6 +1823,13 @@ 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) -> ()