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

# Conflicts:
#	api/swimos_api/Cargo.toml

Author: SirCipher

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

@@ -22,9 +22,9 @@ use either::Either;
 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_form::read::ReadEvent;
+use swimos_form::read::Recognizer;
+use swimos_form::read::{ReadError, StructuralReadable};
 use swimos_model::bigint::{BigInt, BigUint, Sign};
 
 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

@@ -24,7 +24,7 @@ use rmp::encode::{
     write_sint, write_str, write_u64, ValueWriteError,
 };
 
-use swimos_form::structural::write::{
+use swimos_form::write::{
     BodyWriter, HeaderWriter, Label, PrimitiveWriter, RecordBodyKind, StructuralWritable,
     StructuralWriter,
 };

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> {

api/formats/swimos_recon/src/encoding.rs

@@ -14,7 +14,7 @@
 
 use bytes::{Buf, BufMut, BytesMut};
 use std::fmt::Write;
-use swimos_form::structural::{read::recognizer::Recognizer, write::StructuralWritable};
+use swimos_form::{read::Recognizer, write::StructuralWritable};
 use swimos_utilities::encoding::consume_bounded;
 use tokio_util::codec::{Decoder, Encoder};
 

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

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 use bytes::{BufMut, BytesMut};
-use swimos_form::structural::read::recognizer::RecognizerReadable;
+use swimos_form::read::RecognizerReadable;
 use swimos_model::{Attr, Item, Value};
 use tokio_util::codec::{Decoder, Encoder};
 

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

@@ -18,7 +18,7 @@ mod tests;
 use base64::display::Base64Display;
 use std::borrow::Cow;
 use std::fmt::{Debug, Display, Formatter};
-use swimos_form::structural::write::{
+use swimos_form::write::{
     BodyWriter, HeaderWriter, Label, PrimitiveWriter, RecordBodyKind, StructuralWritable,
     StructuralWriter,
 };

api/formats/swimos_recon/src/recon_parser/async_parser/mod.rs

@@ -23,8 +23,8 @@ use nom::Parser;
 use std::error::Error;
 use std::fmt::{Display, Formatter};
 use std::str::Utf8Error;
-use swimos_form::structural::read::recognizer::{Recognizer, RecognizerReadable};
-use swimos_form::structural::read::ReadError;
+use swimos_form::read::ReadError;
+use swimos_form::read::{Recognizer, RecognizerReadable};
 use swimos_model::{Item, Value};
 use tokio::io::{AsyncRead, AsyncReadExt};
 use tokio_util::codec::Decoder;