Skip to content

Commit

Permalink
refactor: change the return type of OnEvent::on_event to `crate::Re…
Browse files Browse the repository at this point in the history
…sult<()>`
  • Loading branch information
vyfor committed Dec 6, 2024
1 parent 28e93f0 commit 54f69dc
Show file tree
Hide file tree
Showing 15 changed files with 38 additions and 19 deletions.
4 changes: 3 additions & 1 deletion src/messages/events/client/clear_activity.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(())
}
}
4 changes: 3 additions & 1 deletion src/messages/events/client/connect.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(())
}
}
4 changes: 3 additions & 1 deletion src/messages/events/client/disconnect.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(())
}
}
4 changes: 3 additions & 1 deletion src/messages/events/client/initialize.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/messages/events/client/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
4 changes: 3 additions & 1 deletion src/messages/events/client/reset_timestamp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(())
}
}
4 changes: 3 additions & 1 deletion src/messages/events/client/update_activity.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(())
}
}
4 changes: 3 additions & 1 deletion src/messages/events/client/update_workspace.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(())
}
}
4 changes: 2 additions & 2 deletions src/messages/events/event.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
4 changes: 3 additions & 1 deletion src/messages/events/local/client_disconnected.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(())
}
}
4 changes: 3 additions & 1 deletion src/messages/events/local/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(())
}
}
2 changes: 1 addition & 1 deletion src/messages/events/local/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
3 changes: 2 additions & 1 deletion src/messages/events/server/log.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(())
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/messages/events/server/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
8 changes: 4 additions & 4 deletions src/messages/events/server/ready.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(())
}
}

Expand Down

0 comments on commit 54f69dc

Please sign in to comment.