From db56d4658fab4a9c99a415550510daf0c2dc6dd2 Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Mon, 23 Jan 2023 23:02:22 +0000
Subject: util/Cargo.toml: Updated rmp-serde from 0.15 to 1.1.

---
 src/util/Cargo.toml | 2 +-
 src/util/encode.rs  | 6 ++----
 src/util/migrate.rs | 6 ++----
 3 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'src/util')

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)
 	}
-- 
cgit v1.2.3