diff options
| author | Alex Auvolat <alex@adnab.me> | 2021-02-23 21:27:28 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2021-02-23 21:27:28 +0100 |
| commit | 20e6e9fa2035ac12946bf0dcd5b8049090955bde (patch) | |
| tree | 96c9a1a72833b16672b69e588c625248f9b40857 /src/util | |
| parent | bf25c95fe2fda4ded2e3ca14499e3991e7243532 (diff) | |
| download | garage-20e6e9fa2035ac12946bf0dcd5b8049090955bde.tar.gz garage-20e6e9fa2035ac12946bf0dcd5b8049090955bde.zip | |
Update sled & try to debug deadlock (but its in sled...)
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/Cargo.toml | 2 | ||||
| -rw-r--r-- | src/util/error.rs | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/util/Cargo.toml b/src/util/Cargo.toml index 93115843..35130c96 100644 --- a/src/util/Cargo.toml +++ b/src/util/Cargo.toml @@ -21,7 +21,7 @@ err-derive = "0.2.3" log = "0.4" fasthash = "0.4" -sled = "0.31" +sled = "0.34" toml = "0.5" rmp-serde = "0.14.3" diff --git a/src/util/error.rs b/src/util/error.rs index e5dcf654..dbf71ac1 100644 --- a/src/util/error.rs +++ b/src/util/error.rs @@ -73,11 +73,11 @@ pub enum Error { Message(String), } -impl From<sled::TransactionError<Error>> for Error { - fn from(e: sled::TransactionError<Error>) -> Error { +impl From<sled::transaction::TransactionError<Error>> for Error { + fn from(e: sled::transaction::TransactionError<Error>) -> Error { match e { - sled::TransactionError::Abort(x) => x, - sled::TransactionError::Storage(x) => Error::Sled(x), + sled::transaction::TransactionError::Abort(x) => x, + sled::transaction::TransactionError::Storage(x) => Error::Sled(x), } } } |