From 54f69dcc8c6eb2abf70b55cf97019f659f061daf Mon Sep 17 00:00:00 2001 From: ReBlast Date: Fri, 22 Nov 2024 16:41:56 +0500 Subject: [PATCH] refactor: change the return type of `OnEvent::on_event` to `crate::Result<()>` --- src/messages/events/client/clear_activity.rs | 4 +++- src/messages/events/client/connect.rs | 4 +++- src/messages/events/client/disconnect.rs | 4 +++- src/messages/events/client/initialize.rs | 4 +++- src/messages/events/client/mod.rs | 2 +- src/messages/events/client/reset_timestamp.rs | 4 +++- src/messages/events/client/update_activity.rs | 4 +++- src/messages/events/client/update_workspace.rs | 4 +++- src/messages/events/event.rs | 4 ++-- src/messages/events/local/client_disconnected.rs | 4 +++- src/messages/events/local/error.rs | 4 +++- src/messages/events/local/mod.rs | 2 +- src/messages/events/server/log.rs | 3 ++- src/messages/events/server/mod.rs | 2 +- src/messages/events/server/ready.rs | 8 ++++---- 15 files changed, 38 insertions(+), 19 deletions(-) diff --git a/src/messages/events/client/clear_activity.rs b/src/messages/events/client/clear_activity.rs index 13ba32e9..a699a4aa 100644 --- a/src/messages/events/client/clear_activity.rs +++ b/src/messages/events/client/clear_activity.rs @@ -8,5 +8,7 @@ impl ClearActivityEvent { } impl OnEvent for ClearActivityEvent { - fn on_event(self, _ctx: &EventContext) {} + fn on_event(self, _ctx: &EventContext) -> crate::Result<()> { + Ok(()) + } } diff --git a/src/messages/events/client/connect.rs b/src/messages/events/client/connect.rs index 3d3c6489..9afea941 100644 --- a/src/messages/events/client/connect.rs +++ b/src/messages/events/client/connect.rs @@ -8,5 +8,7 @@ impl ConnectEvent { } impl OnEvent for ConnectEvent { - fn on_event(self, _ctx: &EventContext) {} + fn on_event(self, _ctx: &EventContext) -> crate::Result<()> { + Ok(()) + } } diff --git a/src/messages/events/client/disconnect.rs b/src/messages/events/client/disconnect.rs index cbea8fd2..fe9e6c43 100644 --- a/src/messages/events/client/disconnect.rs +++ b/src/messages/events/client/disconnect.rs @@ -8,5 +8,7 @@ impl DisconnectEvent { } impl OnEvent for DisconnectEvent { - fn on_event(self, _ctx: &EventContext) {} + fn on_event(self, _ctx: &EventContext) -> crate::Result<()> { + Ok(()) + } } diff --git a/src/messages/events/client/initialize.rs b/src/messages/events/client/initialize.rs index cd49beaa..ca7214a1 100644 --- a/src/messages/events/client/initialize.rs +++ b/src/messages/events/client/initialize.rs @@ -7,7 +7,9 @@ pub struct InitializeEvent { } impl OnEvent for InitializeEvent { - fn on_event(self, _ctx: &EventContext) {} + fn on_event(self, _ctx: &EventContext) -> crate::Result<()> { + Ok(()) + } } impl InitializeEvent { diff --git a/src/messages/events/client/mod.rs b/src/messages/events/client/mod.rs index 69abf598..e50e23bc 100644 --- a/src/messages/events/client/mod.rs +++ b/src/messages/events/client/mod.rs @@ -75,7 +75,7 @@ impl ClientEvent { } impl OnEvent for ClientEvent { - fn on_event(self, ctx: &EventContext) { + fn on_event(self, ctx: &EventContext) -> crate::Result<()> { match self { Self::Initialize(e) => e.on_event(ctx), Self::Connect(e) => e.on_event(ctx), diff --git a/src/messages/events/client/reset_timestamp.rs b/src/messages/events/client/reset_timestamp.rs index 37a2ea25..c17a000b 100644 --- a/src/messages/events/client/reset_timestamp.rs +++ b/src/messages/events/client/reset_timestamp.rs @@ -4,5 +4,7 @@ use crate::messages::events::event::{EventContext, OnEvent}; pub struct ResetTimestampEvent; impl OnEvent for ResetTimestampEvent { - fn on_event(self, _ctx: &EventContext) {} + fn on_event(self, _ctx: &EventContext) -> crate::Result<()> { + Ok(()) + } } diff --git a/src/messages/events/client/update_activity.rs b/src/messages/events/client/update_activity.rs index 8575d39b..72979522 100644 --- a/src/messages/events/client/update_activity.rs +++ b/src/messages/events/client/update_activity.rs @@ -13,5 +13,7 @@ impl UpdateActivityEvent { } impl OnEvent for UpdateActivityEvent { - fn on_event(self, _ctx: &EventContext) {} + fn on_event(self, _ctx: &EventContext) -> crate::Result<()> { + Ok(()) + } } diff --git a/src/messages/events/client/update_workspace.rs b/src/messages/events/client/update_workspace.rs index e7705b8d..cd4f217c 100644 --- a/src/messages/events/client/update_workspace.rs +++ b/src/messages/events/client/update_workspace.rs @@ -12,5 +12,7 @@ impl UpdateWorkspaceEvent { } impl OnEvent for UpdateWorkspaceEvent { - fn on_event(self, _ctx: &EventContext) {} + fn on_event(self, _ctx: &EventContext) -> crate::Result<()> { + Ok(()) + } } diff --git a/src/messages/events/event.rs b/src/messages/events/event.rs index 2460461f..c1bf1137 100644 --- a/src/messages/events/event.rs +++ b/src/messages/events/event.rs @@ -17,11 +17,11 @@ pub struct EventContext<'a> { } pub trait OnEvent { - fn on_event(self, ctx: &EventContext); + fn on_event(self, ctx: &EventContext) -> crate::Result<()>; } impl OnEvent for Event { - fn on_event(self, ctx: &EventContext) { + fn on_event(self, ctx: &EventContext) -> crate::Result<()> { match self { Event::Client(e) => e.on_event(ctx), Event::Local(e) => e.on_event(ctx), diff --git a/src/messages/events/local/client_disconnected.rs b/src/messages/events/local/client_disconnected.rs index 9ba75914..090d3912 100644 --- a/src/messages/events/local/client_disconnected.rs +++ b/src/messages/events/local/client_disconnected.rs @@ -4,5 +4,7 @@ use crate::messages::events::event::{EventContext, OnEvent}; pub struct ClientDisconnectedEvent; impl OnEvent for ClientDisconnectedEvent { - fn on_event(self, _ctx: &EventContext) {} + fn on_event(self, _ctx: &EventContext) -> crate::Result<()> { + Ok(()) + } } diff --git a/src/messages/events/local/error.rs b/src/messages/events/local/error.rs index f153aae6..0a9ba2fb 100644 --- a/src/messages/events/local/error.rs +++ b/src/messages/events/local/error.rs @@ -14,5 +14,7 @@ impl ErrorEvent { } impl OnEvent for ErrorEvent { - fn on_event(self, _ctx: &EventContext) {} + fn on_event(self, _ctx: &EventContext) -> crate::Result<()> { + Ok(()) + } } diff --git a/src/messages/events/local/mod.rs b/src/messages/events/local/mod.rs index 4dd0b283..9a7abc0a 100644 --- a/src/messages/events/local/mod.rs +++ b/src/messages/events/local/mod.rs @@ -13,7 +13,7 @@ pub enum LocalEvent { } impl OnEvent for LocalEvent { - fn on_event(self, ctx: &EventContext) { + fn on_event(self, ctx: &EventContext) -> crate::Result<()> { match self { Self::ClientDisconnected(e) => e.on_event(ctx), Self::Error(e) => e.on_event(ctx), diff --git a/src/messages/events/server/log.rs b/src/messages/events/server/log.rs index 4de7cd22..c600b2a8 100644 --- a/src/messages/events/server/log.rs +++ b/src/messages/events/server/log.rs @@ -6,8 +6,9 @@ pub struct LogEvent { use crate::messages::events::event::{EventContext, OnEvent}; impl OnEvent for LogEvent { - fn on_event(self, _ctx: &EventContext) { + fn on_event(self, _ctx: &EventContext) -> crate::Result<()> { println!("{}", self.message); + Ok(()) } } diff --git a/src/messages/events/server/mod.rs b/src/messages/events/server/mod.rs index 3e090f42..dc71303e 100644 --- a/src/messages/events/server/mod.rs +++ b/src/messages/events/server/mod.rs @@ -13,7 +13,7 @@ pub enum ServerEvent { } impl OnEvent for ServerEvent { - fn on_event(self, ctx: &EventContext) { + fn on_event(self, ctx: &EventContext) -> crate::Result<()> { match self { Self::Ready(e) => e.on_event(ctx), Self::Log(e) => e.on_event(ctx), diff --git a/src/messages/events/server/ready.rs b/src/messages/events/server/ready.rs index 708b4eef..ff191ca2 100644 --- a/src/messages/events/server/ready.rs +++ b/src/messages/events/server/ready.rs @@ -12,10 +12,10 @@ use crate::{ pub struct ReadyEvent; impl OnEvent for ReadyEvent { - fn on_event(self, ctx: &EventContext) { - if let Ok(json) = Json::serialize(&self) { - let _ = ctx.pipe.broadcast(json.as_bytes()); - } + fn on_event(self, ctx: &EventContext) -> crate::Result<()> { + ctx.pipe.broadcast(Json::serialize(&self)?.as_bytes())?; + + Ok(()) } }