diff options
| author | Marcel Müller <m.mueller@ifm.com> | 2022-03-22 13:54:34 +0100 |
|---|---|---|
| committer | Marcel Müller <m.mueller@ifm.com> | 2022-03-22 14:16:16 +0100 |
| commit | adab22a9aed60b3e3a091f4107df23eadf24d85f (patch) | |
| tree | def22c701d829f5618bf9696cdd9c1342f9e2d78 /crates | |
| parent | 67d222982b7388f4e4a80308c60947cda621dcc4 (diff) | |
Re-export CancellationToken
Signed-off-by: Marcel Müller <m.mueller@ifm.com>
Diffstat (limited to 'crates')
| -rw-r--r-- | crates/core/tedge_api/examples/heartbeat.rs | 3 | ||||
| -rw-r--r-- | crates/core/tedge_api/src/lib.rs | 7 | ||||
| -rw-r--r-- | crates/core/tedge_api/src/plugin.rs | 3 |
3 files changed, 8 insertions, 5 deletions
diff --git a/crates/core/tedge_api/examples/heartbeat.rs b/crates/core/tedge_api/examples/heartbeat.rs index 60e77ef1..15793bfc 100644 --- a/crates/core/tedge_api/examples/heartbeat.rs +++ b/crates/core/tedge_api/examples/heartbeat.rs @@ -10,9 +10,8 @@ use tedge_api::{ address::ReplySender, message::NoReply, plugin::{BuiltPlugin, Handle, HandleTypes, Message, PluginExt}, - Address, Plugin, PluginBuilder, PluginConfiguration, PluginDirectory, PluginError, + Address, Plugin, PluginBuilder, PluginConfiguration, PluginDirectory, PluginError, CancellationToken, }; -use tokio_util::sync::CancellationToken; /// A message that represents a heartbeat that gets sent to plugins #[derive(Debug)] diff --git a/crates/core/tedge_api/src/lib.rs b/crates/core/tedge_api/src/lib.rs index 74e6e746..8c23477d 100644 --- a/crates/core/tedge_api/src/lib.rs +++ b/crates/core/tedge_api/src/lib.rs @@ -22,7 +22,12 @@ pub use error::PluginError; pub mod message; pub use message::CoreMessages; + +/// Cancellation token used by `tedge_api` +/// +pub use tokio_util::sync::CancellationToken; + #[doc(hidden)] -mod _internal { +pub mod _internal { pub use futures::future::BoxFuture; } diff --git a/crates/core/tedge_api/src/plugin.rs b/crates/core/tedge_api/src/plugin.rs index bda1f837..3e99997f 100644 --- a/crates/core/tedge_api/src/plugin.rs +++ b/crates/core/tedge_api/src/plugin.rs @@ -5,7 +5,6 @@ //! 2. Create your plugin struct that implements `Plugin` use futures::future::BoxFuture; -use tokio_util::sync::CancellationToken; use std::{ any::{Any, TypeId}, collections::HashSet, @@ -229,7 +228,7 @@ pub trait PluginBuilder<PD: PluginDirectory>: Sync + Send + 'static { async fn instantiate( &self, config: PluginConfiguration, - cancellation_token: CancellationToken, + cancellation_token: crate::CancellationToken, core_comms: &PD, ) -> Result<BuiltPlugin, PluginError> where |