Flattened utilities crate.

Author: horned-sphere

api/swimos_api/src/agent/mod.rs

@@ -28,8 +28,8 @@ use std::{
 use bytes::Bytes;
 use futures::{future::BoxFuture, ready, Future, FutureExt};
 use swimos_utilities::{
+    byte_channel::{ByteReader, ByteWriter},
     future::RetryStrategy,
-    io::byte_channel::{ByteReader, ByteWriter},
     non_zero_usize,
     routing::RouteUri,
 };

api/swimos_api/src/downlink/mod.rs

@@ -17,7 +17,7 @@ use std::num::NonZeroUsize;
 use futures::future::BoxFuture;
 use swimos_model::{address::Address, Text};
 use swimos_utilities::{
-    io::byte_channel::{ByteReader, ByteWriter},
+    byte_channel::{ByteReader, ByteWriter},
     non_zero_usize,
 };
 

api/swimos_client_api/src/downlink/mod.rs

@@ -19,7 +19,7 @@ use swimos_api::address::Address;
 use swimos_api::{agent::DownlinkKind, error::DownlinkTaskError};
 use swimos_model::Text;
 use swimos_utilities::{
-    io::byte_channel::{ByteReader, ByteWriter},
+    byte_channel::{ByteReader, ByteWriter},
     non_zero_usize,
 };
 

client/runtime/src/models.rs

@@ -25,7 +25,7 @@ use swimos_runtime::downlink::{
     AttachAction, DownlinkRuntimeConfig, IdentifiedAddress, MapDownlinkRuntime, NoInterpretation,
     ValueDownlinkRuntime,
 };
-use swimos_utilities::io::byte_channel::{ByteReader, ByteWriter};
+use swimos_utilities::byte_channel::{ByteReader, ByteWriter};
 use swimos_utilities::trigger;
 use tokio::sync::mpsc;
 use uuid::Uuid;

client/runtime/src/runtime.rs

@@ -41,7 +41,7 @@ use swimos_model::Text;
 use swimos_remote::net::ClientConnections;
 use swimos_remote::AttachClient;
 use swimos_runtime::downlink::{AttachAction, DownlinkOptions, DownlinkRuntimeConfig};
-use swimos_utilities::io::byte_channel::{byte_channel, ByteReader, ByteWriter};
+use swimos_utilities::byte_channel::{byte_channel, ByteReader, ByteWriter};
 use swimos_utilities::trigger;
 use swimos_utilities::trigger::promise;
 

client/runtime/src/tests.rs

@@ -57,7 +57,7 @@ use swimos_model::Text;
 use swimos_remote::ws::RatchetError;
 use swimos_remote::AttachClient;
 use swimos_runtime::downlink::{DownlinkOptions, DownlinkRuntimeConfig};
-use swimos_utilities::io::byte_channel::{byte_channel, ByteReader, ByteWriter};
+use swimos_utilities::byte_channel::{byte_channel, ByteReader, ByteWriter};
 use swimos_utilities::trigger::{promise, trigger};
 use swimos_utilities::{non_zero_usize, trigger};
 

runtime/swimos_messages/src/protocol/tests.rs

@@ -30,8 +30,8 @@ use swimos_form::write::StructuralWritable;
 use swimos_form::Form;
 use swimos_model::Text;
 use swimos_recon::print_recon_compact;
+use swimos_utilities::byte_channel;
 use swimos_utilities::encoding::BytesStr;
-use swimos_utilities::io::byte_channel;
 use swimos_utilities::non_zero_usize;
 use tokio_util::codec::{Decoder, Encoder, FramedRead, FramedWrite};
 use uuid::Uuid;

runtime/swimos_persistence/Cargo.toml

@@ -10,7 +10,7 @@ rocks = ["rocksdb", "swimos_store/rocks"]
 [dependencies]
 swimos_store = { path = "../../swimos_store" }
 rocksdb = { workspace = true, optional = true }
-swimos_utilities = { path = "../../swimos_utilities", features = ["io", "trigger", "future"] }
+swimos_utilities = { path = "../../swimos_utilities", features = ["io", "circular_buffer", "future"] }
 swimos_model = { path = "../../api/swimos_model" }
 swimos_form = { path = "../../api/swimos_form" }
 swimos_api = { path = "../../api/swimos_api" }

runtime/swimos_persistence/src/server/mod.rs

@@ -29,7 +29,7 @@ use swimos_store::{Keyspace, Keyspaces, StoreBuilder, StoreError};
 use crate::plane::{open_plane, PlaneStore, SwimPlaneStore};
 use integer_encoding::FixedInt;
 pub use swimos_store::nostore::NoStore;
-use swimos_utilities::io::fs::Dir;
+use swimos_utilities::fs::Dir;
 
 /// Unique lane identifier keyspace. The name is `default` as either the Rust RocksDB crate or
 /// Rocks DB itself has an issue in using merge operators under a non-default column family.

runtime/swimos_remote/src/task/mod.rs

@@ -43,8 +43,8 @@ use swimos_messages::warp::{peel_envelope_header_str, RawEnvelope};
 use swimos_model::Text;
 use swimos_recon::parser::MessageExtractError;
 use swimos_utilities::{
+    byte_channel::{ByteReader, ByteWriter},
     encoding::BytesStr,
-    io::byte_channel::{ByteReader, ByteWriter},
     multi_reader::MultiReader,
     trigger,
 };