Move the Ion value types to the types module

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;

src/element/element_stream_reader.rs

@@ -361,8 +361,8 @@ mod reader_tests {
     use super::*;
     use crate::result::IonResult;
     use crate::stream_reader::IonReader;
-    use crate::types::decimal::Decimal;
-    use crate::types::timestamp::Timestamp;
+    use crate::types::Decimal;
+    use crate::types::Timestamp;
 
     use crate::IonType;
 

src/element/iterators.rs

@@ -1,6 +1,5 @@
 use crate::element::Element;
 use crate::Symbol;
-use smallvec::SmallVec;
 // This macro defines a new iterator type for a given `Iterator => Item` type name pair.
 //
 // The implementation produced can be used to iterate over any `Vec<Item>` or `&[Item]`.
@@ -64,56 +63,3 @@ impl Iterator for AnnotationsIntoIter {
         self.into_iter.next()
     }
 }
-
-// A convenient type alias for a vector capable of storing a single `usize` inline
-// without heap allocation. This type should not be used in public interfaces directly.
-pub(crate) type IndexVec = SmallVec<[usize; 1]>;
-
-/// Iterates over the (field name, field value) pairs in a Struct.
-pub struct FieldIterator<'a> {
-    values: Option<std::slice::Iter<'a, (Symbol, Element)>>,
-}
-
-impl<'a> FieldIterator<'a> {
-    pub(crate) fn new(data: &'a [(Symbol, Element)]) -> Self {
-        FieldIterator {
-            values: Some(data.iter()),
-        }
-    }
-
-    pub(crate) fn empty() -> FieldIterator<'static> {
-        FieldIterator { values: None }
-    }
-}
-
-impl<'a> Iterator for FieldIterator<'a> {
-    type Item = (&'a Symbol, &'a Element);
-
-    fn next(&mut self) -> Option<Self::Item> {
-        self.values
-            .as_mut()
-            // Get the next &(name, value) and convert it to (&name, &value)
-            .and_then(|iter| iter.next().map(|field| (&field.0, &field.1)))
-    }
-}
-
-/// Iterates over the values associated with a given field name in a Struct.
-pub struct FieldValuesIterator<'a> {
-    pub(super) current: usize,
-    pub(super) indexes: Option<&'a IndexVec>,
-    pub(super) by_index: &'a Vec<(Symbol, Element)>,
-}
-
-impl<'a> Iterator for FieldValuesIterator<'a> {
-    type Item = &'a Element;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        self.indexes
-            .and_then(|i| i.get(self.current))
-            .and_then(|i| {
-                self.current += 1;
-                self.by_index.get(*i)
-            })
-            .map(|(_name, value)| value)
-    }
-}

src/element/mod.rs

@@ -25,26 +25,20 @@ use std::fmt::{Display, Formatter};
 
 mod annotations;
 pub mod builders;
-mod bytes;
 mod element_stream_reader;
-mod iterators;
-mod list;
-mod lob;
+pub(crate) mod iterators;
 pub mod reader;
-mod sequence;
-mod sexp;
-mod r#struct;
 pub mod writer;
 
 // Re-export the Value variant types and traits so they can be accessed directly from this module.
-pub use self::bytes::Bytes;
+pub use crate::types::Bytes;
+pub use crate::types::{Blob, Clob};
 pub use annotations::{Annotations, IntoAnnotations};
-pub use lob::{Blob, Clob};
 
-pub use list::List;
-pub use r#struct::Struct;
-pub use sequence::Sequence;
-pub use sexp::SExp;
+pub use crate::types::List;
+pub use crate::types::SExp;
+pub use crate::types::Sequence;
+pub use crate::types::Struct;
 
 impl IonEq for Value {
     fn ion_eq(&self, other: &Self) -> bool {
@@ -614,7 +608,7 @@ where
 #[cfg(test)]
 mod tests {
     use crate::element::annotations::IntoAnnotations;
-    use crate::types::timestamp::Timestamp;
+    use crate::types::Timestamp;
     use crate::{ion_list, ion_sexp, ion_struct, Decimal, Int, IonType, Symbol};
     use chrono::*;
     use rstest::*;
@@ -864,7 +858,7 @@ mod tests {
     }
 
     use crate::element::{Annotations, Element, IntoAnnotatedElement, Struct};
-    use crate::types::integer::IntAccess;
+    use crate::types::IntAccess;
     use num_bigint::BigInt;
     use std::collections::HashSet;
     use std::str::FromStr;

src/element/reader.rs

@@ -197,8 +197,8 @@ mod reader_tests {
     use crate::element::Value::*;
     use crate::element::{Element, IntoAnnotatedElement};
     use crate::ion_data::IonEq;
-    use crate::types::integer::Int;
-    use crate::types::timestamp::Timestamp as TS;
+    use crate::types::Int;
+    use crate::types::Timestamp as TS;
     use crate::{IonType, Symbol};
     use bigdecimal::BigDecimal;
     use num_bigint::BigInt;

src/ion_hash/representation.rs

@@ -10,9 +10,9 @@ use crate::binary::{self, decimal::DecimalBinaryEncoder, timestamp::TimestampBin
 use crate::element::{Element, Sequence, Struct};
 use crate::ion_hash::element_hasher::ElementHasher;
 use crate::ion_hash::type_qualifier::type_qualifier_symbol;
-use crate::types::decimal::Decimal;
-use crate::types::integer::Int;
-use crate::{result::IonResult, types::timestamp::Timestamp, IonType, Symbol};
+use crate::types::Decimal;
+use crate::types::Int;
+use crate::{result::IonResult, types::Timestamp, IonType, Symbol};
 use digest::{FixedOutput, Output, Reset, Update};
 
 pub(crate) trait RepresentationEncoder {

src/lib.rs

@@ -188,7 +188,6 @@ mod raw_symbol_token_ref;
 pub mod reader;
 mod shared_symbol_table;
 mod stream_reader;
-mod symbol;
 mod symbol_ref;
 mod symbol_table;
 mod system_reader;
@@ -204,15 +203,15 @@ pub use raw_symbol_token::RawSymbolToken;
 #[doc(inline)]
 pub use raw_symbol_token_ref::RawSymbolTokenRef;
 
-pub use symbol::Symbol;
 pub use symbol_ref::SymbolRef;
 pub use symbol_table::SymbolTable;
 
-pub use types::decimal::Decimal;
-pub use types::integer::Int;
-pub use types::string::Str;
-pub use types::timestamp::Timestamp;
+pub use types::Decimal;
+pub use types::Int;
 pub use types::IonType;
+pub use types::Str;
+pub use types::Symbol;
+pub use types::Timestamp;
 
 pub use ion_data::IonData;
 

src/raw_reader.rs

@@ -1,8 +1,8 @@
 use crate::element::{Blob, Clob};
 use crate::raw_symbol_token::RawSymbolToken;
 use crate::stream_reader::IonReader;
-use crate::types::string::Str;
 use crate::types::IonType;
+use crate::types::Str;
 use crate::{Decimal, Int, IonResult, Timestamp};
 use std::fmt::{Display, Formatter};
 use std::io::Read;

src/reader.rs

@@ -12,15 +12,15 @@ use crate::raw_reader::{RawReader, RawStreamItem};
 use crate::raw_symbol_token::RawSymbolToken;
 use crate::result::{decoding_error, decoding_error_raw, IonResult};
 use crate::stream_reader::IonReader;
-use crate::symbol::Symbol;
 use crate::symbol_table::SymbolTable;
-use crate::types::decimal::Decimal;
-use crate::types::integer::Int;
-use crate::types::timestamp::Timestamp;
+use crate::types::Decimal;
+use crate::types::Int;
+use crate::types::Symbol;
+use crate::types::Timestamp;
 use crate::{BlockingRawBinaryReader, BlockingRawTextReader, IonType};
 use std::fmt::{Display, Formatter};
 
-use crate::types::string::Str;
+use crate::types::Str;
 /// Configures and constructs new instances of [Reader].
 pub struct ReaderBuilder {}
 

src/stream_reader.rs

@@ -1,10 +1,10 @@
 use crate::element::{Blob, Clob};
 use crate::result::IonResult;
-use crate::types::decimal::Decimal;
-use crate::types::integer::Int;
-use crate::types::string::Str;
-use crate::types::timestamp::Timestamp;
+use crate::types::Decimal;
+use crate::types::Int;
 use crate::types::IonType;
+use crate::types::Str;
+use crate::types::Timestamp;
 
 /**
  * This trait captures the format-agnostic parser functionality needed to navigate within an Ion
@@ -85,7 +85,7 @@ pub trait IonReader {
     /// error is encountered while reading, returns [crate::IonError].
     fn read_i64(&mut self) -> IonResult<i64>;
 
-    /// Attempts to read the current item as an Ion integer and return it as an [crate::Int]. If the
+    /// Attempts to read the current item as an Ion integer and return it as an [`Int`](crate::types::Int). If the
     /// current item is not an integer or an IO error is encountered while reading, returns
     /// [crate::IonError].
     fn read_int(&mut self) -> IonResult<Int>;