minot-cli 0.5.2__tar.gz → 0.5.3__tar.gz

{minot_cli-0.5.2 → minot_cli-0.5.3}/Cargo.lock

@@ -2493,7 +2493,7 @@ dependencies = [
 
 [[package]]
 name = "minot"
-version = "0.5.2"
+version = "0.5.3"
 dependencies = [
  "anyhow",
  "bytesize",
@@ -2590,7 +2590,7 @@ dependencies = [
 
 [[package]]
 name = "mt_bagread"
-version = "0.5.2"
+version = "0.5.3"
 dependencies = [
  "anyhow",
  "camino",
@@ -2610,7 +2610,7 @@ dependencies = [
 
 [[package]]
 name = "mt_mtc"
-version = "0.5.2"
+version = "0.5.3"
 dependencies = [
  "anyhow",
  "ariadne",
@@ -2623,7 +2623,7 @@ dependencies = [
 
 [[package]]
 name = "mt_net"
-version = "0.5.2"
+version = "0.5.3"
 dependencies = [
  "anyhow",
  "rkyv 0.8.15",
@@ -2633,7 +2633,7 @@ dependencies = [
 
 [[package]]
 name = "mt_rat"
-version = "0.5.2"
+version = "0.5.3"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -2648,7 +2648,7 @@ dependencies = [
 
 [[package]]
 name = "mt_sea"
-version = "0.5.2"
+version = "0.5.3"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -2664,7 +2664,7 @@ dependencies = [
 
 [[package]]
 name = "mt_wind"
-version = "0.5.2"
+version = "0.5.3"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -3788,7 +3788,7 @@ dependencies = [
 
 [[package]]
 name = "ratpub"
-version = "0.5.2"
+version = "0.5.3"
 dependencies = [
  "anyhow",
  "async-trait",

{minot_cli-0.5.2 → minot_cli-0.5.3}/Cargo.toml

@@ -4,7 +4,7 @@ members = ["minot", "ratpub", "mt_bagread", "mt_mtc", "mt_sea", "mt_wind", "mt_n
 resolver = "3"
 
 [workspace.package]
-version = "0.5.2"
+version = "0.5.3"
 keywords = ["robotics"]
 license = "MIT OR Apache-2.0"
 repository = "https://codeberg.org/stelzo/minot"
@@ -28,12 +28,12 @@ exclude = [
 ]
 
 [workspace.dependencies]
-mt_sea = { path = "mt_sea", version = "0.5.2" }
-ratpub = { path = "ratpub", version = "0.5.2" }
-mt_bagread = { path = "mt_bagread", version = "0.5.2" }
-mt_net = { path = "mt_net", version = "0.5.2" }
-mt_wind = { path = "mt_wind", version = "0.5.2" }
-mt_mtc = { path = "mt_mtc", version = "0.5.2" }
+mt_sea = { path = "mt_sea", version = "0.5.3" }
+ratpub = { path = "ratpub", version = "0.5.3" }
+mt_bagread = { path = "mt_bagread", version = "0.5.3" }
+mt_net = { path = "mt_net", version = "0.5.3" }
+mt_wind = { path = "mt_wind", version = "0.5.3" }
+mt_mtc = { path = "mt_mtc", version = "0.5.3" }
 
 # Tools
 anyhow = "1.0"

{minot_cli-0.5.2 → minot_cli-0.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: minot-cli
-Version: 0.5.2
+Version: 0.5.3
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research
 Classifier: License :: OSI Approved :: MIT License

{minot_cli-0.5.2 → minot_cli-0.5.3}/mt_sea/src/lib.rs

@@ -164,6 +164,10 @@ use rkyv::rancor::Error as RkyvError;
 pub trait Sendable: Sized + Send + Sync + 'static
 where
     Self: for<'b> Serialize<HighSerializer<AlignedVec, ArenaHandle<'b>, RkyvError>>,
+    Self: Archive<
+        Archived: for<'a> CheckBytes<HighValidator<'a, rkyv::rancor::Error>>
+                      + Deserialize<Self, Strategy<Pool, rkyv::rancor::Error>>,
+    >,
 {
 }
 // Blanket implementation for Sendable. Any type meeting the bounds is Sendable.
@@ -171,6 +175,10 @@ impl<T> Sendable for T
 where
     T: Sized + Send + Sync + 'static,
     T: for<'b> Serialize<HighSerializer<AlignedVec, ArenaHandle<'b>, RkyvError>>,
+    T: Archive<
+        Archived: for<'a> CheckBytes<HighValidator<'a, rkyv::rancor::Error>>
+                      + Deserialize<T, Strategy<Pool, rkyv::rancor::Error>>,
+    >,
 {
 }
 
@@ -191,12 +199,7 @@ pub trait Cannon: Send + Sync + 'static {
     /// Catch the dumped data from the source.
     /// The returning Vec can contain previously missed entities of T from existing sync connections.
     /// The first item of T is the newest, followed by incremental older ones.
-    async fn catch<T>(&self, id: u32) -> anyhow::Result<Vec<T>>
-    where
-        T: Send,
-        T: Archive,
-        T::Archived: for<'a> CheckBytes<HighValidator<'a, rkyv::rancor::Error>>
-            + Deserialize<T, Strategy<Pool, rkyv::rancor::Error>>;
+    async fn catch<T: Sendable>(&self, id: u32) -> anyhow::Result<Vec<T>>;
 
     async fn catch_dyn(&self, id: u32) -> anyhow::Result<Vec<(String, VariableType, String)>>;
 }

{minot_cli-0.5.2 → minot_cli-0.5.3}/ratpub/src/lib.rs

@@ -1,9 +1,5 @@
 use anyhow::anyhow;
 use log::{debug, error};
-use rkyv::{
-    Archive, Deserialize, api::high::HighValidator, bytecheck::CheckBytes, de::Pool,
-    rancor::Strategy,
-};
 use std::{marker::PhantomData, sync::Arc};
 
 use mt_sea::{net::Packet, ship::NetworkShipImpl, *};
@@ -44,22 +40,11 @@ impl<T: Sendable> Publisher<T> {
 }
 
 #[derive(Debug)]
-pub struct Subscriber<T>
-where
-    T: Archive,
-    T::Archived: for<'a> CheckBytes<HighValidator<'a, rkyv::rancor::Error>>
-        + Deserialize<T, Strategy<Pool, rkyv::rancor::Error>>,
-{
+pub struct Subscriber<T: Sendable> {
     chan: tokio::sync::mpsc::Receiver<T>,
 }
 
-impl<T> Subscriber<T>
-where
-    T: Send + Sync + 'static,
-    T: Archive,
-    T::Archived: for<'a> CheckBytes<HighValidator<'a, rkyv::rancor::Error>>
-        + Deserialize<T, Strategy<Pool, rkyv::rancor::Error>>,
-{
+impl<T: Sendable> Subscriber<T> {
     pub async fn next(&mut self) -> Option<T> {
         self.chan.recv().await
     }
@@ -140,17 +125,11 @@ impl Node {
         })
     }
 
-    pub async fn create_subscriber<T>(
+    pub async fn create_subscriber<T: Sendable>(
         &self,
         topic: String,
         queue_size: usize,
-    ) -> anyhow::Result<Subscriber<T>>
-    where
-        T: Send + Sync + 'static,
-        T: Archive,
-        T::Archived: for<'a> CheckBytes<HighValidator<'a, rkyv::rancor::Error>>
-            + Deserialize<T, Strategy<Pool, rkyv::rancor::Error>>,
-    {
+    ) -> anyhow::Result<Subscriber<T>> {
         let client = self.ship.client.lock().await;
         let coord_tx = {
             let client_send_lock = client.coordinator_send.read().unwrap();