From eb57378570861e3772032e5f93a6a06e3804923f Mon Sep 17 00:00:00 2001
From: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
Date: Fri, 10 Jul 2020 17:07:49 +0200
Subject: [PATCH] Update to new Preserves API

---
 Cargo.lock                  | 4 ++--
 Cargo.toml                  | 2 +-
 src/bin/syndicate-server.rs | 2 +-
 src/packets.rs              | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fab8d71..cd70374 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -916,9 +916,9 @@ checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea"
 
 [[package]]
 name = "preserves"
-version = "0.8.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8eade8ff3ea59ce25ee828a495f57f63dff191823ed0c750a50a7dda262cad5"
+checksum = "825f64130c1d838e60d3783e866ca9abb54b7eea1527a7a12d1676a960e2a88e"
 dependencies = [
  "lazy_static",
  "num",
diff --git a/Cargo.toml b/Cargo.toml
index 1372810..40fd5ae 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,7 +15,7 @@ lto = true
 name = "syndicate"
 
 [dependencies]
-preserves = "0.8.1"
+preserves = "0.9.0"
 
 serde = { version = "1.0", features = ["derive", "rc"] }
 serde_bytes = "0.11"
diff --git a/src/bin/syndicate-server.rs b/src/bin/syndicate-server.rs
index 259646b..1850641 100644
--- a/src/bin/syndicate-server.rs
+++ b/src/bin/syndicate-server.rs
@@ -25,7 +25,7 @@ fn encode_message(p: packets::S2C) ->
     Result<Message, packets::Error>
 {
     let mut bs = Vec::with_capacity(128);
-    preserves::ser::to_writer(&mut bs, &p)?;
+    preserves::ser::to_writer(&mut preserves::value::PackedWriter(&mut bs), &p)?;
     Ok(Message::Binary(bs))
 }
 
diff --git a/src/packets.rs b/src/packets.rs
index f501c92..13fa149 100644
--- a/src/packets.rs
+++ b/src/packets.rs
@@ -8,7 +8,7 @@ use preserves::{
     de::Deserializer,
     error,
     ser::to_writer,
-    value::reader::from_bytes,
+    value::{PackedReader, PackedWriter},
 };
 
 pub type EndpointName = V;
@@ -68,7 +68,7 @@ impl<InT: serde::de::DeserializeOwned, OutT> tokio_util::codec::Decoder for Code
     type Item = InT;
     type Error = Error;
     fn decode(&mut self, bs: &mut BytesMut) -> Result<Option<Self::Item>, Self::Error> {
-        let mut r = from_bytes(bs);
+        let mut r = PackedReader::decode_bytes(bs);
         let mut d = Deserializer::from_reader(&mut r);
         match Self::Item::deserialize(&mut d) {
             Err(e) if error::is_eof_error(&e) => Ok(None),
@@ -86,6 +86,6 @@ impl<InT, OutT: serde::Serialize> tokio_util::codec::Encoder<OutT> for Codec<InT
 {
     type Error = Error;
     fn encode(&mut self, item: OutT, bs: &mut BytesMut) -> Result<(), Self::Error> {
-        to_writer(&mut bs.writer(), &item)
+        to_writer(&mut PackedWriter(&mut bs.writer()), &item)
     }
 }