diff options
| author | Alex Auvolat <alex@adnab.me> | 2022-06-03 14:16:30 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2022-06-03 14:16:30 +0200 |
| commit | 16e0a655d0d01e3871aee81a0a9660102d6df74e (patch) | |
| tree | dacb8b88e3ac4f559111ce3f03f6e8fb977b25ee /src/table | |
| parent | d3d7df098b4188ea26d3cec29f2cc226d55d783e (diff) | |
| download | garage-16e0a655d0d01e3871aee81a0a9660102d6df74e.tar.gz garage-16e0a655d0d01e3871aee81a0a9660102d6df74e.zip | |
Update rmp-serde
Diffstat (limited to 'src/table')
| -rw-r--r-- | src/table/Cargo.toml | 2 | ||||
| -rw-r--r-- | src/table/data.rs | 2 | ||||
| -rw-r--r-- | src/table/merkle.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/table/Cargo.toml b/src/table/Cargo.toml index 6de37cda..690d5a71 100644 --- a/src/table/Cargo.toml +++ b/src/table/Cargo.toml @@ -26,7 +26,7 @@ hexdump = "0.1" tracing = "0.1.30" rand = "0.8" -rmp-serde = "0.15" +rmp-serde = "1.1" serde = { version = "1.0", default-features = false, features = ["derive", "rc"] } serde_bytes = "0.11" diff --git a/src/table/data.rs b/src/table/data.rs index 427ce763..17402bb6 100644 --- a/src/table/data.rs +++ b/src/table/data.rs @@ -297,7 +297,7 @@ where } pub fn decode_entry(&self, bytes: &[u8]) -> Result<F::E, Error> { - match rmp_serde::decode::from_read_ref::<_, F::E>(bytes) { + match rmp_serde::decode::from_slice::<F::E>(bytes) { Ok(x) => Ok(x), Err(e) => match F::try_migrate(bytes) { Some(x) => Ok(x), diff --git a/src/table/merkle.rs b/src/table/merkle.rs index c6653a64..8c574d09 100644 --- a/src/table/merkle.rs +++ b/src/table/merkle.rs @@ -354,7 +354,7 @@ impl MerkleNode { fn decode_opt(ent: Option<db::Value<'_>>) -> Result<Self, Error> { match ent { None => Ok(MerkleNode::Empty), - Some(v) => Ok(rmp_serde::decode::from_read_ref::<_, MerkleNode>(&v[..])?), + Some(v) => Ok(rmp_serde::decode::from_slice::<MerkleNode>(&v[..])?), } } |