Flattened bigint reexport.

Author: horned-sphere

api/formats/swimos_msgpack/Cargo.toml

@@ -12,6 +12,7 @@ swimos_model = { path = "../../swimos_model" }
 bytes = { workspace = true }
 byteorder = "1.4"
 rmp = "0.8"
+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,7 +22,7 @@ use swimos_form::write::{
     BodyWriter, HeaderWriter, Label, PrimitiveWriter, RecordBodyKind, StructuralWritable,
     StructuralWriter,
 };
-use swimos_model::bigint::{BigInt, BigUint};
+use swimos_model::{BigInt, BigUint};
 use swimos_model::literal::write_string_literal;
 
 /// Print an inline Recon representation of [`StructuralWritable`] value.

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

@@ -21,7 +21,7 @@ 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::{BigInt, BigUint};
 use swimos_model::{Attr, Item, Text, Value};
 
 fn span(input: &str) -> Span<'_> {

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

@@ -25,9 +25,10 @@ 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::{BigInt, BigUint};
 use swimos_model::identifier::{is_identifier_char, is_identifier_start};
 use swimos_model::Text;
+use num_bigint::{ParseBigIntError, Sign};
 
 fn unwrap_span(span: Span<'_>) -> &str {
     &span

api/swimos_form/Cargo.toml

@@ -11,6 +11,7 @@ swimos_model = { path = "../swimos_model" }
 chrono = { workspace = true }
 either = { workspace = true }
 num-traits = { workspace = true }
+num-bigint = { workspace = true }
 
 [dev-dependencies]
 trybuild = { workspace = true }

api/swimos_form/src/structural/bridge/mod.rs

@@ -23,7 +23,7 @@ use crate::structural::write::{
     StructuralWriter,
 };
 use std::borrow::Cow;
-use swimos_model::bigint::{BigInt, BigUint};
+use swimos_model::{BigInt, BigUint};
 
 /// Bridge to forward writes to a [`StructuralWriter`] instance to the builder methods
 /// on a [`StructuralReadable`] type.