Skip to content

Commit 56bba18

Browse files
committed
Updates to new boxed API
1 parent febb370 commit 56bba18

File tree

7 files changed

+15
-13
lines changed

7 files changed

+15
-13
lines changed

server/swimos_agent/src/agent_model/downlink/hosted/event/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ use crate::{
3939
},
4040
config::SimpleDownlinkConfig,
4141
downlink_lifecycle::EventDownlinkLifecycle,
42-
event_handler::{LocalBoxEventHandler, HandlerActionExt},
42+
event_handler::{HandlerActionExt, LocalBoxEventHandler},
4343
};
4444

4545
use super::{DlState, DlStateObserver, DlStateTracker};

server/swimos_agent/src/agent_model/downlink/hosted/event/tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ use super::{EventDownlinkFactory, SimpleDownlinkConfig};
3232
use crate::{
3333
agent_model::downlink::{BoxDownlinkChannel, DownlinkChannelEvent},
3434
downlink_lifecycle::{OnConsumeEvent, OnFailed, OnLinked, OnSynced, OnUnlinked},
35-
event_handler::{LocalBoxEventHandler, HandlerActionExt, SideEffect},
35+
event_handler::{HandlerActionExt, LocalBoxEventHandler, SideEffect},
3636
};
3737

3838
struct FakeAgent;

server/swimos_agent/src/agent_model/downlink/hosted/map/mod.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,14 @@ use tokio::sync::mpsc;
4545
use tokio_util::codec::{FramedRead, FramedWrite};
4646
use tracing::{debug, error, info, trace};
4747

48+
use crate::event_handler::LocalBoxEventHandler;
4849
use crate::{
4950
agent_model::downlink::{
5051
BoxDownlinkChannel, DownlinkChannel, DownlinkChannelError, DownlinkChannelEvent,
5152
},
5253
config::MapDownlinkConfig,
5354
downlink_lifecycle::MapDownlinkLifecycle,
54-
event_handler::{BoxEventHandler, HandlerActionExt, Sequentially},
55+
event_handler::{HandlerActionExt, Sequentially},
5556
event_queue::EventQueue,
5657
};
5758

@@ -497,7 +498,8 @@ where
497498
MapMessage::Clear => {
498499
trace!("Clearing the map.");
499500
let old_map = state.clear();
500-
maybe_lifecycle.map(|lifecycle| lifecycle.on_clear(old_map).boxed_local())
501+
maybe_lifecycle
502+
.map(|lifecycle| lifecycle.on_clear(old_map).boxed_local())
501503
}
502504
MapMessage::Take(n) => {
503505
trace!("Retaining the first {} items.", n);

server/swimos_agent/src/agent_model/downlink/hosted/value/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ use crate::{
4646
},
4747
config::SimpleDownlinkConfig,
4848
downlink_lifecycle::ValueDownlinkLifecycle,
49-
event_handler::{LocalBoxEventHandler, HandlerActionExt},
49+
event_handler::{HandlerActionExt, LocalBoxEventHandler},
5050
};
5151

5252
use super::{DlState, DlStateObserver, DlStateTracker, OutputWriter, RestartableOutput};

server/swimos_agent/src/agent_model/downlink/hosted/value/tests.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1153,7 +1153,7 @@ impl TestState {
11531153
}
11541154

11551155
impl OnLinked<FakeAgent> for TestState {
1156-
type OnLinkedHandler<'a> = BoxEventHandler<'a, FakeAgent>
1156+
type OnLinkedHandler<'a> = LocalBoxEventHandler<'a, FakeAgent>
11571157
where
11581158
Self: 'a;
11591159

@@ -1167,7 +1167,7 @@ impl OnLinked<FakeAgent> for TestState {
11671167
}
11681168

11691169
impl OnUnlinked<FakeAgent> for TestState {
1170-
type OnUnlinkedHandler<'a> = BoxEventHandler<'a, FakeAgent>
1170+
type OnUnlinkedHandler<'a> = LocalBoxEventHandler<'a, FakeAgent>
11711171
where
11721172
Self: 'a;
11731173

@@ -1181,7 +1181,7 @@ impl OnUnlinked<FakeAgent> for TestState {
11811181
}
11821182

11831183
impl OnFailed<FakeAgent> for TestState {
1184-
type OnFailedHandler<'a> = BoxEventHandler<'a, FakeAgent>
1184+
type OnFailedHandler<'a> = LocalBoxEventHandler<'a, FakeAgent>
11851185
where
11861186
Self: 'a;
11871187

@@ -1191,7 +1191,7 @@ impl OnFailed<FakeAgent> for TestState {
11911191
}
11921192

11931193
impl OnSynced<i32, FakeAgent> for TestState {
1194-
type OnSyncedHandler<'a> = BoxEventHandler<'a, FakeAgent>
1194+
type OnSyncedHandler<'a> = LocalBoxEventHandler<'a, FakeAgent>
11951195
where
11961196
Self: 'a;
11971197

@@ -1207,7 +1207,7 @@ impl OnSynced<i32, FakeAgent> for TestState {
12071207
}
12081208

12091209
impl OnDownlinkEvent<i32, FakeAgent> for TestState {
1210-
type OnEventHandler<'a> = BoxEventHandler<'a, FakeAgent>
1210+
type OnEventHandler<'a> = LocalBoxEventHandler<'a, FakeAgent>
12111211
where
12121212
Self: 'a;
12131213

server/swimos_agent/src/agent_model/downlink/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ use thiserror::Error;
3030
use tokio::sync::mpsc;
3131
use tracing::error;
3232

33-
use crate::event_handler::BoxEventHandler;
33+
use crate::event_handler::LocalBoxEventHandler;
3434
use crate::{
3535
config::{MapDownlinkConfig, SimpleDownlinkConfig},
3636
downlink_lifecycle::{EventDownlinkLifecycle, MapDownlinkLifecycle, ValueDownlinkLifecycle},
@@ -313,7 +313,7 @@ pub trait DownlinkChannel<Context> {
313313

314314
/// After a call to `await_ready` that does not return [`None`] this may return an event handler to
315315
/// be executed by the agent task. At any other time, it will return [`None`].
316-
fn next_event(&mut self, context: &Context) -> Option<BoxEventHandler<'_, Context>>;
316+
fn next_event(&mut self, context: &Context) -> Option<LocalBoxEventHandler<'_, Context>>;
317317

318318
/// Flush any pending outputs.
319319
fn flush(&mut self) -> BoxFuture<'_, Result<(), std::io::Error>>;

server/swimos_agent/src/agent_model/tests/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ use uuid::Uuid;
4242

4343
use crate::{
4444
agent_model::HostedDownlinkEvent,
45-
event_handler::{LocalBoxEventHandler, HandlerActionExt, UnitHandler},
45+
event_handler::{HandlerActionExt, LocalBoxEventHandler, UnitHandler},
4646
};
4747

4848
use self::{

0 commit comments

Comments
 (0)