diff --git a/src/euph/conn.rs b/src/euph/conn.rs index 067fddc..8f597f5 100644 --- a/src/euph/conn.rs +++ b/src/euph/conn.rs @@ -157,6 +157,7 @@ impl Joined { } #[derive(Debug, Clone)] +#[allow(clippy::large_enum_variant)] pub enum Status { Joining(Joining), Joined(Joined), diff --git a/src/euph/room.rs b/src/euph/room.rs index c6a7d65..fac1659 100644 --- a/src/euph/room.rs +++ b/src/euph/room.rs @@ -32,7 +32,7 @@ pub enum Error { enum Event { Connected(ConnTx), Disconnected, - Data(Data), + Data(Box), Status(oneshot::Sender>), RequestLogs, Nick(String), @@ -85,7 +85,7 @@ impl State { event_tx.send(Event::Connected(conn_tx))?; while let Ok(data) = conn_rx.recv().await { - event_tx.send(Event::Data(data))?; + event_tx.send(Event::Data(Box::new(data)))?; } info!("e&{}: disconnected", name); @@ -160,7 +160,7 @@ impl State { self.conn_tx = None; self.last_msg_id = None; } - Event::Data(data) => self.on_data(data).await?, + Event::Data(data) => self.on_data(*data).await?, Event::Status(reply_tx) => self.on_status(reply_tx).await, Event::RequestLogs => self.on_request_logs(), Event::Nick(name) => self.on_nick(name), @@ -342,12 +342,6 @@ impl Room { rx.await.map_err(|_| Error::Stopped) } - pub fn request_logs(&self) -> Result<(), Error> { - self.event_tx - .send(Event::RequestLogs) - .map_err(|_| Error::Stopped) - } - pub fn nick(&self, name: String) -> Result<(), Error> { self.event_tx .send(Event::Nick(name)) diff --git a/src/logger.rs b/src/logger.rs index de48440..9a52477 100644 --- a/src/logger.rs +++ b/src/logger.rs @@ -105,7 +105,7 @@ impl MsgStore for Logger { } impl Log for Logger { - fn enabled(&self, metadata: &log::Metadata) -> bool { + fn enabled(&self, _metadata: &log::Metadata) -> bool { true } diff --git a/src/vault/euph.rs b/src/vault/euph.rs index d5f16ed..0f37d81 100644 --- a/src/vault/euph.rs +++ b/src/vault/euph.rs @@ -102,7 +102,7 @@ impl EuphVault { pub fn add_message(&self, msg: Message, prev_msg: Option) { let request = EuphRequest::AddMsg { room: self.room.clone(), - msg, + msg: Box::new(msg), prev_msg, }; let _ = self.vault.tx.send(request.into()); @@ -232,7 +232,7 @@ pub(super) enum EuphRequest { ////////////// AddMsg { room: String, - msg: Message, + msg: Box, prev_msg: Option, }, AddMsgs { @@ -286,7 +286,7 @@ impl EuphRequest { room, msg, prev_msg, - } => Self::add_msg(conn, room, msg, prev_msg), + } => Self::add_msg(conn, room, *msg, prev_msg), EuphRequest::AddMsgs { room, msgs,