Merge pull request #1132 from spacejam/tyler_0.34

0.34

Author: spacejam

CHANGELOG.md

@@ -1,4 +1,9 @@
-# Unreleased
+# 0.34
+
+## Improvements
+
+* #1132 implemented From<sled::Error> for io::Error to
+  reduce friction in some situations.
 
 ## Breaking Changes
 

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sled"
-version = "0.33.0"
+version = "0.34.0"
 authors = ["Tyler Neely <[email protected]>"]
 description = "a modern embedded database"
 license = "MIT/Apache-2.0"

src/result.rs

@@ -143,6 +143,38 @@ impl From<io::Error> for Error {
     }
 }
 
+impl From<Error> for io::Error {
+    fn from(error: Error) -> io::Error {
+        use self::Error::*;
+        use std::io::ErrorKind;
+        match error {
+            Io(ioe) => ioe,
+            CollectionNotFound(name) =>
+                io::Error::new(
+                ErrorKind::NotFound,
+                format!("collection not found: {:?}", name),
+            ),
+            Unsupported(why) => io::Error::new(
+                ErrorKind::InvalidInput,
+                format!("operation not supported: {:?}", why),
+            ),
+            ReportableBug(what) => io::Error::new(
+                ErrorKind::Other,
+                format!("unexpected bug! please report this bug at <github.rs/spacejam/sled>: {:?}", what),
+            ),
+            Corruption { .. } => io::Error::new(
+                ErrorKind::InvalidData,
+                format!("corruption encountered: {:?}", error),
+            ),
+            #[cfg(feature = "failpoints")]
+            FailPoint => io::Error::new(
+                ErrorKind::Other,
+                "failpoint"
+            ),
+        }
+    }
+}
+
 impl StdError for Error {}
 
 impl Display for Error {