diff options
Diffstat (limited to 'crates/turtle/src/atuin_daemon/control/mod.rs')
| -rw-r--r-- | crates/turtle/src/atuin_daemon/control/mod.rs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/crates/turtle/src/atuin_daemon/control/mod.rs b/crates/turtle/src/atuin_daemon/control/mod.rs index 7015db5b..79398d61 100644 --- a/crates/turtle/src/atuin_daemon/control/mod.rs +++ b/crates/turtle/src/atuin_daemon/control/mod.rs @@ -52,7 +52,7 @@ impl Control for ControlService { .event .ok_or_else(|| Status::invalid_argument("event is required"))?; - let daemon_event = proto_event_to_daemon_event(event)?; + let daemon_event = proto_event_to_daemon_event(event); info!(?daemon_event, "received control event"); self.handle.emit(daemon_event); @@ -62,15 +62,15 @@ impl Control for ControlService { } /// Convert a proto event to a daemon event. -fn proto_event_to_daemon_event(event: Event) -> Result<DaemonEvent, Status> { +fn proto_event_to_daemon_event(event: Event) -> DaemonEvent { match event { - Event::HistoryPruned(_) => Ok(DaemonEvent::HistoryPruned), - Event::HistoryRebuilt(_) => Ok(DaemonEvent::HistoryRebuilt), - Event::HistoryDeleted(e) => Ok(DaemonEvent::HistoryDeleted { + Event::HistoryPruned(_) => DaemonEvent::HistoryPruned, + Event::HistoryRebuilt(_) => DaemonEvent::HistoryRebuilt, + Event::HistoryDeleted(e) => DaemonEvent::HistoryDeleted { ids: e.ids.into_iter().map(HistoryId).collect(), - }), - Event::ForceSync(_) => Ok(DaemonEvent::ForceSync), - Event::SettingsReloaded(_) => Ok(DaemonEvent::SettingsReloaded), - Event::Shutdown(_) => Ok(DaemonEvent::ShutdownRequested), + }, + Event::ForceSync(_) => DaemonEvent::ForceSync, + Event::SettingsReloaded(_) => DaemonEvent::SettingsReloaded, + Event::Shutdown(_) => DaemonEvent::ShutdownRequested, } } |