diff options
author | Jonathan Davies <jpds@protonmail.com> | 2023-01-23 23:02:22 +0000 |
---|---|---|
committer | Jonathan Davies <jpds@protonmail.com> | 2023-01-26 11:03:43 +0000 |
commit | db56d4658fab4a9c99a415550510daf0c2dc6dd2 (patch) | |
tree | 598324dfe4c5f37db333699d6797956aa6aa4e9a /src | |
parent | 12a4e1f303336b6ee77417d84eebd9d38be92699 (diff) | |
download | garage-db56d4658fab4a9c99a415550510daf0c2dc6dd2.tar.gz garage-db56d4658fab4a9c99a415550510daf0c2dc6dd2.zip |
util/Cargo.toml: Updated rmp-serde from 0.15 to 1.1.
Diffstat (limited to 'src')
-rw-r--r-- | src/util/Cargo.toml | 2 | ||||
-rw-r--r-- | src/util/encode.rs | 6 | ||||
-rw-r--r-- | src/util/migrate.rs | 6 |
3 files changed, 5 insertions, 9 deletions
diff --git a/src/util/Cargo.toml b/src/util/Cargo.toml index 32e9c851..0468b7f4 100644 --- a/src/util/Cargo.toml +++ b/src/util/Cargo.toml @@ -32,7 +32,7 @@ rand = "0.8" sha2 = "0.10" chrono = "0.4" -rmp-serde = "0.15" +rmp-serde = "1.1" serde = { version = "1.0", default-features = false, features = ["derive", "rc"] } serde_json = "1.0" toml = "0.5" diff --git a/src/util/encode.rs b/src/util/encode.rs index 1cd3198f..a9ab9a35 100644 --- a/src/util/encode.rs +++ b/src/util/encode.rs @@ -8,9 +8,7 @@ where T: Serialize + ?Sized, { let mut wr = Vec::with_capacity(128); - let mut se = rmp_serde::Serializer::new(&mut wr) - .with_struct_map() - .with_string_variants(); + let mut se = rmp_serde::Serializer::new(&mut wr).with_struct_map(); val.serialize(&mut se)?; Ok(wr) } @@ -22,7 +20,7 @@ pub fn nonversioned_decode<T>(bytes: &[u8]) -> Result<T, rmp_serde::decode::Erro where T: for<'de> Deserialize<'de> + ?Sized, { - rmp_serde::decode::from_read_ref::<_, T>(bytes) + rmp_serde::decode::from_slice::<_>(bytes) } /// Serialize to JSON, truncating long result diff --git a/src/util/migrate.rs b/src/util/migrate.rs index 1229fd9c..5b708cc8 100644 --- a/src/util/migrate.rs +++ b/src/util/migrate.rs @@ -19,7 +19,7 @@ pub trait Migrate: Serialize + for<'de> Deserialize<'de> + 'static { fn decode(bytes: &[u8]) -> Option<Self> { let marker_len = Self::VERSION_MARKER.len(); if bytes.get(..marker_len) == Some(Self::VERSION_MARKER) { - if let Ok(value) = rmp_serde::decode::from_read_ref::<_, Self>(&bytes[marker_len..]) { + if let Ok(value) = rmp_serde::decode::from_slice::<_>(&bytes[marker_len..]) { return Some(value); } } @@ -31,9 +31,7 @@ pub trait Migrate: Serialize + for<'de> Deserialize<'de> + 'static { fn encode(&self) -> Result<Vec<u8>, rmp_serde::encode::Error> { let mut wr = Vec::with_capacity(128); wr.extend_from_slice(Self::VERSION_MARKER); - let mut se = rmp_serde::Serializer::new(&mut wr) - .with_struct_map() - .with_string_variants(); + let mut se = rmp_serde::Serializer::new(&mut wr).with_struct_map(); self.serialize(&mut se)?; Ok(wr) } |