Merge branch 'main' of https://github.com/swimos/swim-rust into dependabot/cargo/base64-0.22

# Conflicts:
#	api/swimos_schema/src/schema/tests/mod.rs

Author: SirCipher

Cargo.toml

@@ -7,7 +7,6 @@ members = [
     "api/formats/swimos_*",
     "macro_utilities",
     "runtime/swimos_*",
-    "swimos_store",
     "swimos_utilities",
     "swimos_utilities/swimos_*",
     "swimos_downlink",
@@ -104,7 +103,6 @@ clap = "4.1"
 crossbeam-queue = { version = "0.3" }
 crossbeam-channel = { version = "0.5" }
 hyper = "0.14"
-lazy_static = "1.4.0"
 percent-encoding = "2.1.0"
 mime = "0.3"
 serde_json = "1.0"

api/formats/swimos_msgpack/Cargo.toml

@@ -12,6 +12,7 @@ swimos_model = { path = "../../swimos_model" }
 bytes = { workspace = true }
 byteorder = { workspace = true }
 rmp = { workspace = true }
+num-bigint = { workspace = true }
 
 [dev-dependencies]
 

api/formats/swimos_msgpack/src/lib.rs

@@ -17,16 +17,16 @@
 //! Provides a MessagesPack backend for the Swim serialization system. This consists of two parts:
 //!
 //! - A function [`read_from_msg_pack`] that will attempt to deserialize any type that implements
-//!  [`swimos_form::structural::read::StructuralReadable`] from a buffer containing MessagePack data.
-//! - The type [`MsgPackInterpreter`] that implements [`swimos_form::structural::write::StructuralWriter`]
-//! allowing any type that implements [`swimos_form::structural::write::StructuralWritable`] to be
+//!  [`swimos_form::read::StructuralReadable`] from a buffer containing MessagePack data.
+//! - The type [`MsgPackInterpreter`] that implements [`swimos_form::write::StructuralWriter`]
+//! allowing any type that implements [`swimos_form::write::StructuralWritable`] to be
 //! serialized as MessagePack.
 //!
 //! # Examples
 //!
 //! ```
 //! use bytes::{BufMut, BytesMut};
-//! use swimos_form::structural::write::StructuralWritable;
+//! use swimos_form::write::StructuralWritable;
 //! use swimos_msgpack::{read_from_msg_pack, MsgPackInterpreter};
 //!
 //! let mut buffer = BytesMut::with_capacity(128);

api/formats/swimos_msgpack/src/reader/mod.rs

@@ -19,13 +19,14 @@ use std::str::Utf8Error;
 
 use bytes::{Buf, BufMut, BytesMut};
 use either::Either;
+use num_bigint::Sign;
 use rmp::decode::{read_str_len, ValueReadError};
 use rmp::Marker;
 
-use swimos_form::structural::read::event::ReadEvent;
-use swimos_form::structural::read::recognizer::Recognizer;
-use swimos_form::structural::read::{ReadError, StructuralReadable};
-use swimos_model::bigint::{BigInt, BigUint, Sign};
+use swimos_form::read::ReadEvent;
+use swimos_form::read::Recognizer;
+use swimos_form::read::{ReadError, StructuralReadable};
+use swimos_model::{BigInt, BigUint};
 
 use crate::{BIG_INT_EXT, BIG_UINT_EXT};
 

api/formats/swimos_msgpack/src/reader/tests.rs

@@ -14,7 +14,7 @@
 
 use crate::reader::MsgPackReadError;
 use rmp::Marker;
-use swimos_form::structural::read::ReadError;
+use swimos_form::read::ReadError;
 
 const INVALID_UTF8: [u8; 2] = [0xc3, 0x28];
 

api/formats/swimos_msgpack/src/writer/mod.rs

@@ -19,16 +19,17 @@ use std::io;
 use std::io::Write;
 
 use byteorder::WriteBytesExt;
+use num_bigint::Sign;
 use rmp::encode::{
     write_array_len, write_bin, write_bool, write_ext_meta, write_f64, write_map_len, write_nil,
     write_sint, write_str, write_u64, ValueWriteError,
 };
 
-use swimos_form::structural::write::{
+use swimos_form::write::{
     BodyWriter, HeaderWriter, Label, PrimitiveWriter, RecordBodyKind, StructuralWritable,
     StructuralWriter,
 };
-use swimos_model::bigint::{BigInt, BigUint, Sign};
+use swimos_model::{BigInt, BigUint};
 
 use crate::{BIG_INT_EXT, BIG_UINT_EXT};
 

api/formats/swimos_msgpack/src/writer/tests.rs

@@ -14,7 +14,7 @@
 
 use crate::MsgPackWriteError;
 use std::io::ErrorKind;
-use swimos_model::bigint::{BigInt, BigUint};
+use swimos_model::{BigInt, BigUint};
 
 #[test]
 fn msgpack_write_err_display() {

api/formats/swimos_recon/Cargo.toml

@@ -23,6 +23,7 @@ tokio-util = { workspace = true, features = ["codec"] }
 bytes = { workspace = true }
 smallvec = { workspace = true }
 thiserror = { workspace = true }
+num-bigint = { workspace = true }
 
 [dev-dependencies]
 tokio = { workspace = true, features = ["io-util", "macros", "rt", "fs"] }

api/formats/swimos_recon/src/comparator/mod.rs

@@ -15,7 +15,7 @@
 use crate::recon_parser::{record::ParseIterator, Span};
 use smallvec::SmallVec;
 use std::iter::Peekable;
-use swimos_form::structural::read::event::ReadEvent;
+use swimos_form::read::ReadEvent;
 
 #[cfg(test)]
 mod tests;

api/formats/swimos_recon/src/comparator/tests.rs

@@ -17,7 +17,7 @@ use crate::recon_parser::record::ParseIterator;
 use crate::recon_parser::{parse_recognize, ParseError, Span};
 use nom::error::ErrorKind;
 use std::borrow::Cow;
-use swimos_form::structural::read::event::{NumericValue, ReadEvent};
+use swimos_form::read::{NumericValue, ReadEvent};
 use swimos_model::Value;
 
 fn value_from_string(rep: &str) -> Result<Value, ParseError> {