Move the Ion value types to the types module (#543)

Author: popematt

src/binary/binary_writer.rs

@@ -2,11 +2,11 @@ use crate::binary::raw_binary_writer::{RawBinaryWriter, RawBinaryWriterBuilder};
 use crate::constants::v1_0::system_symbol_ids;
 use crate::raw_symbol_token_ref::{AsRawSymbolTokenRef, RawSymbolTokenRef};
 use crate::result::{illegal_operation, IonResult};
-use crate::types::decimal::Decimal;
-use crate::types::timestamp::Timestamp;
+use crate::types::Decimal;
 use crate::types::SymbolId;
+use crate::types::Timestamp;
 use crate::writer::IonWriter;
-use crate::{Int, IonType, SymbolTable};
+use crate::{types::Int, types::IonType, SymbolTable};
 use delegate::delegate;
 use std::io::Write;
 

src/binary/decimal.rs

@@ -11,11 +11,7 @@ use crate::{
         int::DecodedInt, raw_binary_writer::MAX_INLINE_LENGTH, var_int::VarInt, var_uint::VarUInt,
     },
     result::IonResult,
-    types::{
-        coefficient::{Coefficient, Sign},
-        decimal::Decimal,
-        integer::UInt,
-    },
+    types::{Coefficient, Decimal, Sign, UInt},
     IonError,
 };
 

src/binary/int.rs

@@ -2,9 +2,9 @@ use std::mem;
 
 use crate::data_source::IonDataSource;
 use crate::result::{decoding_error, IonResult};
-use crate::types::coefficient;
-use crate::types::coefficient::Coefficient;
-use crate::Int;
+use crate::types;
+use crate::types::Coefficient;
+use crate::types::Int;
 use num_bigint::{BigInt, Sign};
 use num_traits::Zero;
 use std::io::Write;
@@ -196,7 +196,7 @@ impl From<DecodedInt> for Coefficient {
             is_negative,
             .. // ignore `size_in_bytes`
         } = int;
-        use coefficient::Sign::{Negative, Positive};
+        use types::Sign::{Negative, Positive};
         let sign = if is_negative { Negative } else { Positive };
         Coefficient::new(sign, value)
     }
@@ -206,7 +206,7 @@ impl From<DecodedInt> for Coefficient {
 mod tests {
     use super::*;
     use crate::result::IonResult;
-    use crate::Int;
+    use crate::types::Int;
     use std::io;
     use std::io::Cursor;
 

src/binary/non_blocking/binary_buffer.rs

@@ -7,8 +7,8 @@ use crate::binary::uint::DecodedUInt;
 use crate::binary::var_int::VarInt;
 use crate::binary::var_uint::VarUInt;
 use crate::result::{decoding_error, incomplete_data_error, incomplete_data_error_raw};
-use crate::types::integer::UInt;
-use crate::{Int, IonResult, IonType};
+use crate::types::{Int, UInt};
+use crate::{IonResult, IonType};
 use num_bigint::{BigInt, BigUint, Sign};
 use std::io::Read;
 use std::mem;

src/binary/non_blocking/raw_binary_reader.rs

@@ -5,17 +5,17 @@ use crate::binary::non_blocking::type_descriptor::{Header, TypeDescriptor};
 use crate::binary::uint::DecodedUInt;
 use crate::binary::var_uint::VarUInt;
 use crate::binary::IonTypeCode;
-use crate::element::{Blob, Clob};
 use crate::result::{
     decoding_error, decoding_error_raw, illegal_operation, illegal_operation_raw,
     incomplete_data_error,
 };
-use crate::types::integer::IntAccess;
-use crate::types::string::Str;
+use crate::types::IntAccess;
+use crate::types::Str;
 use crate::types::SymbolId;
+use crate::types::{Blob, Clob};
 use crate::{
-    raw_reader::BufferedRawReader, Decimal, Int, IonReader, IonResult, IonType, RawStreamItem,
-    RawSymbolToken, Timestamp,
+    raw_reader::BufferedRawReader, types::Decimal, Int, IonReader, IonResult, IonType,
+    RawStreamItem, RawSymbolToken, Timestamp,
 };
 use bytes::{BigEndian, Buf, ByteOrder};
 use num_bigint::BigUint;

src/binary/raw_binary_writer.rs

@@ -11,8 +11,8 @@ use crate::binary::uint::DecodedUInt;
 use crate::binary::var_uint::VarUInt;
 use crate::raw_symbol_token_ref::{AsRawSymbolTokenRef, RawSymbolTokenRef};
 use crate::result::{illegal_operation, IonResult};
-use crate::types::decimal::Decimal;
-use crate::types::timestamp::Timestamp;
+use crate::types::Decimal;
+use crate::types::Timestamp;
 use crate::types::{ContainerType, SymbolId};
 use crate::writer::IonWriter;
 use crate::{Int, IonType};
@@ -910,10 +910,10 @@ mod writer_tests {
     use rstest::*;
 
     use super::*;
-    use crate::element::{Blob, Clob};
     use crate::raw_symbol_token::{local_sid_token, RawSymbolToken};
     use crate::reader::{Reader, ReaderBuilder};
-    use crate::symbol::Symbol;
+    use crate::types::Symbol;
+    use crate::types::{Blob, Clob};
     use crate::IonReader;
     use num_bigint::BigInt;
     use num_traits::Float;

src/binary/timestamp.rs

@@ -11,10 +11,7 @@ use crate::{
         var_uint::VarUInt,
     },
     result::IonResult,
-    types::{
-        decimal::Decimal,
-        timestamp::{Mantissa, Precision, Timestamp},
-    },
+    types::{Decimal, Mantissa, Precision, Timestamp},
 };
 
 const MAX_TIMESTAMP_LENGTH: usize = 32;

src/binary/uint.rs

@@ -4,7 +4,7 @@ use std::mem;
 
 use crate::data_source::IonDataSource;
 use crate::result::{decoding_error, IonResult};
-use crate::types::integer::{Int, UInt};
+use crate::types::{Int, UInt};
 
 // This limit is used for stack-allocating buffer space to encode/decode UInts.
 const UINT_STACK_BUFFER_SIZE: usize = 16;

src/blocking_reader.rs

@@ -8,7 +8,7 @@ use crate::raw_reader::BufferedRawReader;
 use crate::result::IonResult;
 use crate::stream_reader::IonReader;
 use crate::text::non_blocking::raw_text_reader::RawTextReader;
-use crate::types::timestamp::Timestamp;
+use crate::types::Timestamp;
 use crate::{Decimal, Int, IonError, IonType, Str};
 
 pub type BlockingRawTextReader<T> = BlockingRawReader<RawTextReader<Vec<u8>>, T>;

src/element/builders.rs

@@ -348,8 +348,8 @@ macro_rules! ion_struct {
     }};
 }
 
-use crate::element::list::List;
-use crate::element::sexp::SExp;
+use crate::types::List;
+use crate::types::SExp;
 pub use ion_list;
 pub use ion_sexp;
 pub use ion_struct;