Merge branch 'main' of https://github.com/swimos/swim-rust

Author: SirCipher

Cargo.toml

@@ -90,7 +90,7 @@ ratchet = { package = "ratchet_rs", version = "0.4" }
 ratchet_fixture = "0.4"
 flate2 = "1.0.22"
 bitflags = "1.3"
-rocksdb = "0.19.0"
+rocksdb = "0.22"
 integer-encoding = "3.0.4"
 rustls = "0.20"
 webpki = "0.22"

client/swimos_client/src/lib.rs

@@ -22,13 +22,12 @@ use futures_util::future::BoxFuture;
 #[cfg(feature = "deflate")]
 use ratchet::deflate::{DeflateConfig, DeflateExtProvider};
 use runtime::{
-    start_runtime, ClientConfig, DownlinkRuntimeError, RawHandle, RemotePath, Transport,
-    WebSocketConfig,
+    start_runtime, ClientConfig, DownlinkRuntimeError, RawHandle, Transport, WebSocketConfig,
 };
-pub use runtime::{CommandError, Commander};
+pub use runtime::{CommandError, Commander, RemotePath};
 use std::sync::Arc;
-use swimos_api::downlink::DownlinkConfig;
-use swimos_downlink::lifecycle::{
+pub use swimos_api::downlink::DownlinkConfig;
+pub use swimos_downlink::lifecycle::{
     BasicMapDownlinkLifecycle, BasicValueDownlinkLifecycle, MapDownlinkLifecycle,
     ValueDownlinkLifecycle,
 };
@@ -222,7 +221,7 @@ impl ClientHandle {
     ///
     /// # Arguments
     /// * `path` - The path of the downlink top open.
-    pub fn value_downlink<L, T>(
+    pub fn value_downlink<T>(
         &self,
         path: RemotePath,
     ) -> ValueDownlinkBuilder<'_, BasicValueDownlinkLifecycle<T>> {
@@ -240,7 +239,7 @@ impl ClientHandle {
     ///
     /// # Arguments
     /// * `path` - The path of the downlink top open.
-    pub fn map_downlink<L, K, V>(
+    pub fn map_downlink<K, V>(
         &self,
         path: RemotePath,
     ) -> MapDownlinkBuilder<'_, BasicMapDownlinkLifecycle<K, V>> {
@@ -287,19 +286,19 @@ impl<'h, L> ValueDownlinkBuilder<'h, L> {
     }
 
     /// Sets link options for the downlink.
-    pub fn options(&mut self, options: DownlinkOptions) -> &mut Self {
+    pub fn options(mut self, options: DownlinkOptions) -> Self {
         self.options = options;
         self
     }
 
     /// Sets a new downlink runtime configuration.
-    pub fn runtime_config(&mut self, config: DownlinkRuntimeConfig) -> &mut Self {
+    pub fn runtime_config(mut self, config: DownlinkRuntimeConfig) -> Self {
         self.runtime_config = config;
         self
     }
 
     /// Sets a new downlink configuration.
-    pub fn downlink_config(&mut self, config: DownlinkConfig) -> &mut Self {
+    pub fn downlink_config(mut self, config: DownlinkConfig) -> Self {
         self.downlink_config = config;
         self
     }
@@ -333,6 +332,7 @@ impl<'h, L> ValueDownlinkBuilder<'h, L> {
     }
 }
 
+#[derive(Debug)]
 pub enum ValueDownlinkOperationError {
     NotYetSynced,
     DownlinkStopped,
@@ -408,19 +408,19 @@ impl<'h, L> MapDownlinkBuilder<'h, L> {
     }
 
     /// Sets link options for the downlink.
-    pub fn options(&mut self, options: DownlinkOptions) -> &mut Self {
+    pub fn options(mut self, options: DownlinkOptions) -> Self {
         self.options = options;
         self
     }
 
     /// Sets a new downlink runtime configuration.
-    pub fn runtime_config(&mut self, config: DownlinkRuntimeConfig) -> &mut Self {
+    pub fn runtime_config(mut self, config: DownlinkRuntimeConfig) -> Self {
         self.runtime_config = config;
         self
     }
 
     /// Sets a new downlink configuration.
-    pub fn downlink_config(&mut self, config: DownlinkConfig) -> &mut Self {
+    pub fn downlink_config(mut self, config: DownlinkConfig) -> Self {
         self.downlink_config = config;
         self
     }

docs/define.md

@@ -120,7 +120,7 @@ of time. To achieve this using the derive macro, a tag can be added to the lane
 ```rust
 #[derive(AgentLaneModel)]
 struct ExampleAgent {
-    #[lane(transient)]
+    #[item(transient)]
     value_lane: ValueLane<i32>,
     map_lane: MapLane<String, u64>,
 }

example_apps/map_lane_persistence/src/agent.rs

@@ -24,7 +24,7 @@ use swimos::agent::{
 #[projections]
 pub struct ExampleAgent {
     map: MapLane<String, i32>,
-    #[lane(transient)]
+    #[item(transient)]
     temporary: MapLane<String, i32>,
     stop: CommandLane<()>,
 }

example_apps/map_store/src/agent.rs

@@ -27,7 +27,7 @@ use crate::model::Instruction;
 #[projections]
 pub struct ExampleAgent {
     lane: ValueLane<i32>,
-    #[lane(transient)]
+    #[item(transient)]
     saved: MapStore<String, i32>,
     command: CommandLane<Instruction>,
 }

example_apps/map_store_persistence/src/agent.rs

@@ -28,7 +28,7 @@ use crate::model::Instruction;
 #[projections]
 pub struct ExampleAgent {
     value: MapStore<String, i32>,
-    #[lane(transient)]
+    #[item(transient)]
     temporary: MapStore<String, i32>,
     instructions: CommandLane<Instruction>,
 }

example_apps/tutorial_app/src/unit_agent.rs

@@ -31,7 +31,7 @@ use tutorial_app_model::{Counter, HistoryItem, Message};
 pub struct UnitAgent {
     publish: CommandLane<Message>,
     history: MapLane<usize, HistoryItem>,
-    #[lane(transient)]
+    #[item(transient)]
     histogram: MapLane<i64, Counter>,
     latest: ValueLane<Option<Message>>,
 }

example_apps/value_lane_persistence/src/agent.rs

@@ -23,7 +23,7 @@ use swimos::agent::{
 #[projections]
 pub struct ExampleAgent {
     value: ValueLane<i32>,
-    #[lane(transient)]
+    #[item(transient)]
     temporary: ValueLane<i32>,
     stop: CommandLane<()>,
 }

example_apps/value_store/src/agent.rs

@@ -27,7 +27,7 @@ use crate::model::Instruction;
 #[projections]
 pub struct ExampleAgent {
     lane: ValueLane<i32>,
-    #[lane(transient)]
+    #[item(transient)]
     saved: ValueStore<i32>,
     command: CommandLane<Instruction>,
 }

example_apps/value_store_persistence/src/agent.rs

@@ -27,7 +27,7 @@ use crate::model::Instruction;
 #[projections]
 pub struct ExampleAgent {
     value: ValueStore<i32>,
-    #[lane(transient)]
+    #[item(transient)]
     temporary: ValueStore<i32>,
     instructions: CommandLane<Instruction>,
 }