From fe1a93b8a23f4b6b756eb930209a6a4fa526a323 Mon Sep 17 00:00:00 2001 From: ppom Date: Sun, 23 Feb 2025 12:00:00 +0100 Subject: [PATCH] Remove more dead code Client/Daemon communication is now JSON so we don't need This quirks anymore --- src/concepts/filter.rs | 1 - src/{protocol/messages.rs => protocol.rs} | 0 src/protocol/mod.rs | 5 --- src/protocol/serialization.rs | 52 ----------------------- 4 files changed, 58 deletions(-) rename src/{protocol/messages.rs => protocol.rs} (100%) delete mode 100644 src/protocol/mod.rs delete mode 100644 src/protocol/serialization.rs diff --git a/src/concepts/filter.rs b/src/concepts/filter.rs index 14a0791..112212c 100644 --- a/src/concepts/filter.rs +++ b/src/concepts/filter.rs @@ -44,7 +44,6 @@ pub struct Filter { } impl Filter { - pub fn name(&self) -> &str { &self.name } diff --git a/src/protocol/messages.rs b/src/protocol.rs similarity index 100% rename from src/protocol/messages.rs rename to src/protocol.rs diff --git a/src/protocol/mod.rs b/src/protocol/mod.rs deleted file mode 100644 index 9dfbe69..0000000 --- a/src/protocol/mod.rs +++ /dev/null @@ -1,5 +0,0 @@ -mod messages; -mod serialization; - -pub use messages::*; -pub use serialization::*; diff --git a/src/protocol/serialization.rs b/src/protocol/serialization.rs deleted file mode 100644 index e1e23d7..0000000 --- a/src/protocol/serialization.rs +++ /dev/null @@ -1,52 +0,0 @@ -use std::marker::PhantomData; - -use serde::de::DeserializeOwned; -use thiserror::Error; -use tokio_util::codec::{Decoder, LengthDelimitedCodec}; - -#[derive(Error, Debug)] -pub enum DecodeError { - #[error("{0}")] - Io(#[from] tokio::io::Error), - #[error("{0}")] - Json(#[from] serde_json::Error), -} - -pub struct LengthPrefixedBincode { - inner: LengthDelimitedCodec, - _marker: PhantomData, -} - -impl LengthPrefixedBincode { - pub fn new() -> Self { - LengthPrefixedBincode { - inner: LengthDelimitedCodec::new(), - _marker: PhantomData, - } - } -} - -impl Default for LengthPrefixedBincode { - fn default() -> Self { - Self::new() - } -} - -impl Decoder for LengthPrefixedBincode { - type Item = T; - type Error = DecodeError; - - fn decode( - &mut self, - src: &mut tokio_util::bytes::BytesMut, - ) -> Result, Self::Error> { - match self.inner.decode(src) { - Ok(Some(data)) => match serde_json::from_slice(&data) { - Ok(thing) => Ok(Some(thing)), - Err(err) => Err(err.into()), - }, - Ok(None) => Ok(None), - Err(err) => Err(err.into()), - } - } -}