rust: support encoding borrowed messages

generator/sbpg/targets/resources/sbp-cargo.toml

@@ -56,7 +56,8 @@ version = "0.3"
 optional = true
 
 [dependencies.dencode]
-version = "0.1.0"
+git = "https://github.com/swift-nav/dencode"
+branch = "steve/generic"
 default-features = false
 
 [dev-dependencies]

generator/sbpg/targets/resources/sbp2json-cargo.toml

@@ -16,11 +16,15 @@ path = "../sbp"
 features = ["json"]
 
 [dependencies]
-dencode = "0.1"
 env_logger = "0.8"
 serde_json = "1.0"
 structopt = "0.3"
 
+[dependencies.dencode]
+git = "https://github.com/swift-nav/dencode"
+branch = "steve/generic"
+default-features = false
+
 [target.'cfg(all(not(windows), not(target_env = "musl")))'.dependencies]
 jemallocator = "0.3"
 

rust/sbp/Cargo.toml

@@ -56,7 +56,8 @@ version = "0.3"
 optional = true
 
 [dependencies.dencode]
-version = "0.1.0"
+git = "https://github.com/swift-nav/dencode"
+branch = "steve/generic"
 default-features = false
 
 [dev-dependencies]

rust/sbp/src/codec/json.rs

@@ -1,7 +1,7 @@
-use std::collections::HashMap;
+use std::{borrow::Borrow, collections::HashMap};
 
 use bytes::{Buf, BufMut, BytesMut};
-use dencode::{Decoder, Encoder};
+use dencode::{Decoder, Encoder, FramedWrite};
 use serde::{de::DeserializeOwned, Deserialize, Serialize};
 use serde_json::{ser::Formatter, Deserializer, Serializer, Value};
 
@@ -156,6 +156,10 @@ impl<F: Formatter + Clone> JsonEncoder<F> {
             formatter,
         }
     }
+
+    pub fn framed<W>(writer: W, formatter: F) -> FramedWrite<W, Self> {
+        FramedWrite::new(writer, Self::new(formatter))
+    }
 }
 
 #[derive(Debug, Serialize)]
@@ -164,16 +168,20 @@ struct JsonOutput<'a> {
     common: CommonJson<'a>,
 
     #[serde(flatten)]
-    msg: SBP,
+    msg: &'a SBP,
 }
 
-impl<F: Formatter + Clone> Encoder for JsonEncoder<F> {
-    type Item = SBP;
+impl<F, T> Encoder<T> for JsonEncoder<F>
+where
+    F: Formatter + Clone,
+    T: Borrow<SBP>,
+{
     type Error = Error;
 
-    fn encode(&mut self, msg: SBP, dst: &mut BytesMut) -> Result<()> {
+    fn encode(&mut self, msg: T, dst: &mut BytesMut) -> Result<()> {
+        let msg = msg.borrow();
         let formatter = self.formatter.clone();
-        let common = get_common_fields(&mut self.payload_buf, &mut self.frame_buf, &msg)?;
+        let common = get_common_fields(&mut self.payload_buf, &mut self.frame_buf, msg)?;
         let output = JsonOutput { common, msg };
 
         let mut ser = Serializer::with_formatter(dst.writer(), formatter);
@@ -208,8 +216,7 @@ impl<F: Formatter + Clone> Json2JsonEncoder<F> {
     }
 }
 
-impl<F: Formatter + Clone> Encoder for Json2JsonEncoder<F> {
-    type Item = Json2JsonInput;
+impl<F: Formatter + Clone> Encoder<Json2JsonInput> for Json2JsonEncoder<F> {
     type Error = Error;
 
     fn encode(&mut self, input: Json2JsonInput, dst: &mut BytesMut) -> Result<()> {
@@ -227,7 +234,7 @@ impl<F: Formatter + Clone> Encoder for Json2JsonEncoder<F> {
         let output = Json2JsonOutput {
             data: JsonOutput {
                 common: get_common_fields(&mut self.payload_buf, &mut self.frame_buf, &msg)?,
-                msg,
+                msg: &msg,
             },
             other: input.other,
         };

rust/sbp/src/codec/sbp.rs

@@ -1,5 +1,7 @@
+use std::borrow::Borrow;
+
 use bytes::{Buf, BufMut, BytesMut};
-use dencode::{Decoder, Encoder, FramedRead};
+use dencode::{Decoder, Encoder, FramedRead, FramedWrite};
 
 use crate::{
     messages::{SBPMessage, SBP},
@@ -71,15 +73,21 @@ impl SbpEncoder {
             frame: Vec::with_capacity(MAX_FRAME_LENGTH),
         }
     }
+
+    pub fn framed<W>(writer: W) -> FramedWrite<W, Self> {
+        FramedWrite::new(writer, Self::new())
+    }
 }
 
-impl Encoder for SbpEncoder {
-    type Item = SBP;
+impl<T> Encoder<T> for SbpEncoder
+where
+    T: Borrow<SBP>,
+{
     type Error = Error;
 
-    fn encode(&mut self, msg: SBP, dst: &mut BytesMut) -> Result<()> {
+    fn encode(&mut self, msg: T, dst: &mut BytesMut) -> Result<()> {
         self.frame.clear();
-        match msg.write_frame(&mut self.frame) {
+        match msg.borrow().write_frame(&mut self.frame) {
             Ok(_) => dst.put_slice(self.frame.as_slice()),
             Err(err) => log::error!("Error converting sbp message to frame: {}", err),
         }

rust/sbp2json/Cargo.toml

@@ -16,11 +16,15 @@ path = "../sbp"
 features = ["json"]
 
 [dependencies]
-dencode = "0.1"
 env_logger = "0.8"
 serde_json = "1.0"
 structopt = "0.3"
 
+[dependencies.dencode]
+git = "https://github.com/swift-nav/dencode"
+branch = "steve/generic"
+default-features = false
+
 [target.'cfg(all(not(windows), not(target_env = "musl")))'.dependencies]
 jemallocator = "0.3"
 

rust/sbp2json/src/lib.rs

@@ -17,7 +17,7 @@ where
     W: Write,
 {
     let source = FramedRead::new(input, JsonDecoder::new());
-    let sink = FramedWrite::new(output, SbpEncoder::new());
+    let sink = SbpEncoder::framed(output);
 
     maybe_send_buffered(source, sink, buffered)?;
 
@@ -45,7 +45,7 @@ where
     F: Formatter + Clone,
 {
     let source = FramedRead::new(input, SbpDecoder {});
-    let sink = FramedWrite::new(output, JsonEncoder::new(formatter));
+    let sink = JsonEncoder::framed(output, formatter);
 
     maybe_send_buffered(source, sink, buffered)?;
 
@@ -60,8 +60,8 @@ fn maybe_send_buffered<R, W, D, E>(
 where
     R: Read,
     W: Write,
-    D: Decoder<Item = E::Item, Error = Error>,
-    E: Encoder<Error = Error>,
+    D: Decoder<Error = Error>,
+    E: Encoder<D::Item, Error = Error>,
 {
     if buffered {
         sink.send_all(source)?;