From 522258c809c9617bd6d92ee7305225a08803b369 Mon Sep 17 00:00:00 2001 From: Tobias Deiminger Date: Sun, 14 Apr 2024 23:17:48 +0200 Subject: Add MsgId as Rust type Up to now it was handled implicitely in Variant::UserType. Making it an explicit type allows to centralize the i32/i64 cfg dependency and to use the type for arguments in signalproxy::objects functions. --- src/primitive/mod.rs | 2 ++ src/primitive/msgid.rs | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 src/primitive/msgid.rs (limited to 'src') diff --git a/src/primitive/mod.rs b/src/primitive/mod.rs index 5124d3b..dbc4a58 100644 --- a/src/primitive/mod.rs +++ b/src/primitive/mod.rs @@ -1,6 +1,7 @@ mod bufferinfo; mod datetime; mod message; +mod msgid; mod signedint; mod string; mod stringlist; @@ -12,6 +13,7 @@ mod variantmap; pub use bufferinfo::*; pub use datetime::*; pub use message::*; +pub use msgid::*; #[allow(unused_imports)] pub use signedint::*; #[allow(unused_imports)] diff --git a/src/primitive/msgid.rs b/src/primitive/msgid.rs new file mode 100644 index 0000000..509c1e7 --- /dev/null +++ b/src/primitive/msgid.rs @@ -0,0 +1,54 @@ +#[derive(Copy, Clone, Debug, std::cmp::PartialEq)] +pub struct MsgId( + #[cfg(not(feature = "long-message-id"))] pub i32, + #[cfg(feature = "long-message-id")] pub i64, +); + +use failure::Error; + +use crate::primitive::signedint; +use crate::{deserialize::*, serialize::*}; + +impl Serialize for MsgId { + fn serialize(&self) -> Result, Error> { + self.0.serialize() + } +} + +impl Deserialize for MsgId { + fn parse(b: &[u8]) -> Result<(usize, Self), Error> { + #[cfg(not(feature = "long-message-id"))] + let (size, value) = i32::parse(b)?; + #[cfg(feature = "long-message-id")] + let (size, value) = i64::parse(b)?; + return Ok((size, MsgId(value))); + } +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + pub fn msgid_parse_test() { + let test_bytes: &[u8] = if cfg!(feature = "long-message-id") { + &[0, 0, 0, 0, 0, 0, 0, 1] + } else { + &[0, 0, 0, 1] + }; + let (len, res) = MsgId::parse(test_bytes).unwrap(); + assert_eq!(len, test_bytes.len()); + assert_eq!(res, MsgId(1)); + } + + #[test] + pub fn msgid_serialize_test() { + let res = MsgId(1).serialize().unwrap(); + let expected_bytes: &[u8] = if cfg!(feature = "long-message-id") { + &[0, 0, 0, 0, 0, 0, 0, 1] + } else { + &[0, 0, 0, 1] + }; + assert_eq!(res, expected_bytes); + } +} -- cgit v1.2.3 >
path: root/deploy/lib/catinator.libsonnet (unfollow)
Commit message (Expand)AuthorLines
2025-12-14fix non-sasl connection registrationMax Audron-9/+35
2025-12-14fix readme badge linksMax Audron-3/+3
2025-12-14update readme and remotesMax Audron-1/+14
2025-12-14release 1.7.01.7.0Max Audron-2/+2
2025-12-14add server passwordMax Audron-1/+6
2025-12-14update cargo dependenciesMax Audron-670/+505
2025-12-14update flake inputs to nixpkgs 25.11Max Audron-36/+41
2025-05-06fix rustls missing cryptoproviderMax Audron-1/+6
2025-05-06remove too commonly used used for shifty_eyesMax Audron-1/+1
2025-05-06fix truncate on unicodeMax Audron-10/+20
2025-05-06update dependenciesMax Audron-691/+1659
2024-08-12add nix build and moduleMax Audron-5/+427
2022-02-19remove jsonnet lock fileMax Audron-36/+0
2022-02-19fix deploy to work with gitlab agentMax Audron-4/+4
2021-10-22write tons of documentation and reorganize some modulesMax Audron-65/+300
2021-10-22remove wolfram alpha url shorteningMax Audron-1/+2
2021-10-20remove failing wolfram alpha test casesMax Audron-105/+55
2021-10-20bump version to 1.6.2Max Audron-3/+2
2021-10-20prepare for release on crates.ioMax Audron-39/+65
2021-10-20add async docs to macro crate and bump versionMax Audron-9/+10
2021-10-20change hook errors to be logged as warningsMax Audron-3/+3
2021-10-20fix configuration not loading correctly on release buildsMax Audron-8/+23
2021-10-19replace sedregex crate8-rework-sedMax Audron-20/+358
2021-10-19add formatting trait for irc codesMax Audron-0/+129
2021-10-17fix links in readmeMax Audron-2/+2