From 14bce9f885ecfb4a0309a7aa398db033f1cc542e Mon Sep 17 00:00:00 2001 From: Tobias Deiminger Date: Tue, 16 Apr 2024 22:06:31 +0200 Subject: Add BufferId as Rust type Up to now it was represented as i32. If we introduce a newtype for it, we can handle it idiomatically as dedicated Variant::BufferId variant (instead of having it mashed into Variant::UserType). --- src/primitive/bufferid.rs | 37 +++++++++++++++++++++++++++++++++++++ src/primitive/mod.rs | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 src/primitive/bufferid.rs (limited to 'src/primitive') diff --git a/src/primitive/bufferid.rs b/src/primitive/bufferid.rs new file mode 100644 index 0000000..6ee2447 --- /dev/null +++ b/src/primitive/bufferid.rs @@ -0,0 +1,37 @@ +#[derive(Copy, Clone, Debug, std::cmp::PartialEq)] +pub struct BufferId(pub i32); + +use crate::{deserialize::*, error::ProtocolError, serialize::*}; + +impl Serialize for BufferId { + fn serialize(&self) -> Result, ProtocolError> { + self.0.serialize() + } +} + +impl Deserialize for BufferId { + fn parse(b: &[u8]) -> Result<(usize, Self), ProtocolError> { + let (size, value) = i32::parse(b)?; + return Ok((size, BufferId(value))); + } +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + pub fn bufferid_parse_test() { + let test_bytes: &[u8] = &[0, 0, 0, 1]; + let (len, res) = BufferId::parse(test_bytes).unwrap(); + assert_eq!(len, test_bytes.len()); + assert_eq!(res, BufferId(1)); + } + + #[test] + pub fn bufferid_serialize_test() { + let res = BufferId(1).serialize().unwrap(); + let expected_bytes: &[u8] = &[0, 0, 0, 1]; + assert_eq!(res, expected_bytes); + } +} diff --git a/src/primitive/mod.rs b/src/primitive/mod.rs index dbc4a58..67bb2ac 100644 --- a/src/primitive/mod.rs +++ b/src/primitive/mod.rs @@ -1,3 +1,4 @@ +mod bufferid; mod bufferinfo; mod datetime; mod message; @@ -10,6 +11,7 @@ mod variant; mod variantlist; mod variantmap; +pub use bufferid::*; pub use bufferinfo::*; pub use datetime::*; pub use message::*; -- cgit v1.2.3