Merge pull request #629 from swimos/docs3

Tidy up of crate/module API: Stage 3

Author: horned-sphere

Cargo.toml

@@ -104,7 +104,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/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::read::ReadEvent;
 use swimos_form::read::Recognizer;
 use swimos_form::read::{ReadError, StructuralReadable};
-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/mod.rs

@@ -19,6 +19,7 @@ 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,
@@ -28,7 +29,7 @@ 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/printer/mod.rs

@@ -22,8 +22,8 @@ use swimos_form::write::{
     BodyWriter, HeaderWriter, Label, PrimitiveWriter, RecordBodyKind, StructuralWritable,
     StructuralWriter,
 };
-use swimos_model::bigint::{BigInt, BigUint};
-use swimos_model::write_string_literal;
+use swimos_model::literal::write_string_literal;
+use swimos_model::{BigInt, BigUint};
 
 /// Print an inline Recon representation of [`StructuralWritable`] value.
 ///

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

@@ -21,8 +21,8 @@ use nom::IResult;
 use std::borrow::Cow;
 use std::ops::{Add, Neg, Sub};
 use swimos_form::read::{NumericValue, ReadEvent};
-use swimos_model::bigint::{BigInt, BigUint};
 use swimos_model::{Attr, Item, Text, Value};
+use swimos_model::{BigInt, BigUint};
 
 fn span(input: &str) -> Span<'_> {
     Span::new(input)

api/formats/swimos_recon/src/recon_parser/tokens.rs

@@ -19,15 +19,16 @@ use nom::combinator::{map, map_res, opt, peek, recognize};
 use nom::multi::{many0_count, many1_count};
 use nom::sequence::{delimited, pair, preceded, tuple};
 use nom::IResult;
+use num_bigint::{ParseBigIntError, Sign};
 use num_traits::Num;
 use std::borrow::Cow;
 use std::convert::TryFrom;
 use std::fmt::{Display, Formatter};
 use std::ops::Neg;
 use swimos_form::read::NumericValue;
-use swimos_model::bigint::{BigInt, BigUint, ParseBigIntError, Sign};
 use swimos_model::identifier::{is_identifier_char, is_identifier_start};
 use swimos_model::Text;
+use swimos_model::{BigInt, BigUint};
 
 fn unwrap_span(span: Span<'_>) -> &str {
     &span

api/swimos_agent_protocol/src/ad_hoc/mod.rs

@@ -16,12 +16,12 @@ use std::fmt::Debug;
 
 use bytes::{Buf, BufMut, BytesMut};
 use swimos_form::{read::RecognizerReadable, write::StructuralWritable};
-use swimos_model::{address::Address, Text, TryFromUtf8Bytes};
+use swimos_model::Text;
 use swimos_recon::{WithLenRecognizerDecoder, WithLenReconEncoder};
-use swimos_utilities::encoding::WithLengthBytesCodec;
+use swimos_utilities::encoding::{TryFromUtf8Bytes, WithLengthBytesCodec};
 use tokio_util::codec::{Decoder, Encoder};
 
-use swimos_api::error::FrameIoError;
+use swimos_api::{address::Address, error::FrameIoError};
 
 use crate::AdHocCommand;