From 2484d7654ace3021cce024d301d575b8eef23ee9 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Tue, 13 Jun 2023 17:22:33 +0200 Subject: [PATCH] update rmp-serde to v1.1, bump to 0.10.0 --- Cargo.lock | 6 +++--- Cargo.toml | 4 ++-- src/message.rs | 4 ++-- src/util.rs | 4 +--- target | 1 + 5 files changed, 9 insertions(+), 10 deletions(-) create mode 120000 target diff --git a/Cargo.lock b/Cargo.lock index 28155ac..3d86fc5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -428,7 +428,7 @@ dependencies = [ [[package]] name = "netapp" -version = "0.5.4" +version = "0.10.0" dependencies = [ "arc-swap", "async-trait", @@ -677,9 +677,9 @@ dependencies = [ [[package]] name = "rmp-serde" -version = "0.15.5" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "723ecff9ad04f4ad92fe1c8ca6c20d2196d9286e9c60727c4cb5511629260e9d" +checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a" dependencies = [ "byteorder", "rmp", diff --git a/Cargo.toml b/Cargo.toml index 4da9f7f..281fc20 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "netapp" -version = "0.5.4" +version = "0.10.0" authors = ["Alex Auvolat "] edition = "2018" license-file = "LICENSE" @@ -27,7 +27,7 @@ tokio-util = { version = "0.7", default-features = false, features = ["compat", tokio-stream = "0.1.7" serde = { version = "1.0", default-features = false, features = ["derive", "rc"] } -rmp-serde = "0.15" +rmp-serde = "1.1" hex = "0.4.2" rand = { version = "0.8" } diff --git a/src/message.rs b/src/message.rs index cd40ea7..b0d255c 100644 --- a/src/message.rs +++ b/src/message.rs @@ -155,7 +155,7 @@ impl Req { } pub(crate) fn from_enc(enc: ReqEnc) -> Result { - let msg = rmp_serde::decode::from_read_ref(&enc.msg)?; + let msg = rmp_serde::decode::from_slice(&enc.msg)?; Ok(Req { msg: Arc::new(msg), msg_ser: Some(enc.msg), @@ -316,7 +316,7 @@ impl Resp { } pub(crate) fn from_enc(enc: RespEnc) -> Result { - let msg = rmp_serde::decode::from_read_ref(&enc.msg)?; + let msg = rmp_serde::decode::from_slice(&enc.msg)?; Ok(Self { _phantom: Default::default(), msg, diff --git a/src/util.rs b/src/util.rs index edf8c49..56230b7 100644 --- a/src/util.rs +++ b/src/util.rs @@ -17,9 +17,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) } diff --git a/target b/target new file mode 120000 index 0000000..9095c69 --- /dev/null +++ b/target @@ -0,0 +1 @@ +/home/lx.nobackup/rust/netapp.target/ \ No newline at end of file