From 0649992530528b9b856e9d2130df17291dd6d662 Mon Sep 17 00:00:00 2001 From: Alex Helfet Date: Fri, 22 Dec 2017 13:42:00 +0000 Subject: [PATCH] Tweak names. --- src/lib.rs | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index b6c0bdc..f969bde 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -56,28 +56,27 @@ use ref_slice::ref_slice_mut; use std::io::{self, Read, Write}; /// TODO -pub struct Frame([u8]); +pub struct Payload(pub [u8]); /// TODO -pub struct Encoded([u8]); +pub struct Encoded(pub [u8]); -const FRAME_END: u8 = 0; +const END_SYMBOL: u8 = 0; /// TODO -pub fn to_slice(_f: &Frame, _dest: &mut [u8]) -> Result { +pub fn to_slice(p: &Payload, dest: &mut [u8]) -> Result { unimplemented!() } /// TODO #[cfg(feature = "use_std")] -pub fn to_box(_f: &Frame) -> Result> { +pub fn to_box(_p: &Payload) -> Result> { unimplemented!() } - /// TODO #[cfg(feature = "use_std")] -pub fn to_writer(_f: &Frame, _w: W) -> Result { +pub fn to_writer(_p: &Payload, _w: W) -> Result { unimplemented!() } @@ -90,14 +89,13 @@ pub fn from_slice_to_slice(_src: &[u8], _dst: &mut [u8]) -> Result { /// TODO #[cfg(feature = "use_std")] -pub fn from_slice_to_box(_src: &Encoded) -> Result> { +pub fn from_slice_to_box(_src: &Encoded) -> Result> { unimplemented!() } - /// TODO #[cfg(feature = "use_std")] -pub fn from_reader(_r: &Read) -> Result> { +pub fn from_reader(_r: &Read) -> Result> { unimplemented!() } @@ -132,9 +130,9 @@ impl Sender { self.w } - pub fn send(&mut self, f: &[u8]) -> Result<()> { - let mut code = cobs::encode_vec(f); - code.push(FRAME_END); + pub fn send(&mut self, p: &[u8]) -> Result<()> { + let mut code = cobs::encode_vec(p); + code.push(END_SYMBOL); #[cfg(feature = "trace")] { println!("framed: Sending code = {:?}", code); } @@ -186,13 +184,13 @@ impl Receiver { #[cfg(feature = "trace")] { println!("framed: Read byte = {}", b); } - if b == FRAME_END { + if b == END_SYMBOL { break; } else { next_frame.push(b); } } - assert!(b == FRAME_END); + assert!(b == END_SYMBOL); cobs::decode_vec(&next_frame) .map_err(|_| Error::CobsDecodeFailed)