diff --git a/implementations/rust/src/lib.rs b/implementations/rust/src/lib.rs index eb83450..93dff6b 100644 --- a/implementations/rust/src/lib.rs +++ b/implementations/rust/src/lib.rs @@ -150,7 +150,7 @@ mod ieee754_section_5_10_total_order_tests { #[cfg(test)] mod value_tests { - use crate::value::{Value, PlainValue, value::Record, signed_integer::SignedInteger}; + use crate::value::{Value, PlainValue, repr::Record, signed_integer::SignedInteger}; use super::dom::Dom; type VV = Value, Dom>; diff --git a/implementations/rust/src/value/de.rs b/implementations/rust/src/value/de.rs index d398e78..a9c6c62 100644 --- a/implementations/rust/src/value/de.rs +++ b/implementations/rust/src/value/de.rs @@ -1,4 +1,4 @@ -use crate::value::value::{Float, Double}; +use crate::value::repr::{Float, Double}; use crate::value::{Value, NestedValue, IOValue, UnwrappedIOValue, Map}; use crate::error::{Error, ExpectedKind, Received}; use serde::Deserialize; diff --git a/implementations/rust/src/value/magic.rs b/implementations/rust/src/value/magic.rs index 1627b94..d5b04b4 100644 --- a/implementations/rust/src/value/magic.rs +++ b/implementations/rust/src/value/magic.rs @@ -1,4 +1,4 @@ -use super::value::IOValue; +use super::repr::IOValue; pub static MAGIC: &str = "$____Preserves_Serde_Magic"; diff --git a/implementations/rust/src/value/mod.rs b/implementations/rust/src/value/mod.rs index b12c8d4..da8626f 100644 --- a/implementations/rust/src/value/mod.rs +++ b/implementations/rust/src/value/mod.rs @@ -4,7 +4,7 @@ pub mod packed; pub mod reader; pub mod ser; pub mod signed_integer; -pub mod value; +pub mod repr; pub mod writer; pub use de::Deserializer; @@ -13,24 +13,24 @@ pub use packed::PackedReader; pub use packed::PackedWriter; pub use reader::ConfiguredReader; pub use reader::Reader; +pub use repr::AnnotatedValue; +pub use repr::ArcValue; +pub use repr::Domain; +pub use repr::IOValue; +pub use repr::Map; +pub use repr::NestedValue; +pub use repr::PlainValue; +pub use repr::RcValue; +pub use repr::Set; +pub use repr::UnwrappedIOValue; +pub use repr::Value; pub use ser::Serializer; pub use ser::to_value; -pub use value::AnnotatedValue; -pub use value::ArcValue; -pub use value::Domain; -pub use value::IOValue; -pub use value::Map; -pub use value::NestedValue; -pub use value::PlainValue; -pub use value::RcValue; -pub use value::Set; -pub use value::UnwrappedIOValue; -pub use value::Value; pub use writer::Writer; -pub use value::FALSE; -pub use value::TRUE; -pub use value::EMPTY_SEQ; +pub use repr::FALSE; +pub use repr::TRUE; +pub use repr::EMPTY_SEQ; pub fn invert_map(m: &Map) -> Map where A: Clone, B: Clone + Ord diff --git a/implementations/rust/src/value/packed/reader.rs b/implementations/rust/src/value/packed/reader.rs index 2fc306f..ac4b774 100644 --- a/implementations/rust/src/value/packed/reader.rs +++ b/implementations/rust/src/value/packed/reader.rs @@ -5,7 +5,7 @@ use std::convert::TryFrom; use std::convert::TryInto; use std::marker::PhantomData; use super::super::signed_integer::SignedInteger; -use super::super::value::{Value, NestedValue, Domain, IOValue, FALSE, TRUE, Map, Set, Record, Annotations}; +use super::super::repr::{Value, NestedValue, Domain, IOValue, FALSE, TRUE, Map, Set, Record, Annotations}; use super::constants::Tag; use super::super::reader::{ diff --git a/implementations/rust/src/value/reader.rs b/implementations/rust/src/value/reader.rs index 29793dd..4c2c4d3 100644 --- a/implementations/rust/src/value/reader.rs +++ b/implementations/rust/src/value/reader.rs @@ -1,7 +1,7 @@ use std::borrow::Cow; use std::io::{Read, Error}; use std::marker::PhantomData; -use super::value::{NestedValue, IOValue}; +use super::repr::{NestedValue, IOValue}; use crate::error::{self, ExpectedKind, Received, io_eof}; pub type IOResult = std::result::Result; diff --git a/implementations/rust/src/value/value.rs b/implementations/rust/src/value/repr.rs similarity index 100% rename from implementations/rust/src/value/value.rs rename to implementations/rust/src/value/repr.rs diff --git a/implementations/rust/src/value/ser.rs b/implementations/rust/src/value/ser.rs index c0c4f40..3ea4d7e 100644 --- a/implementations/rust/src/value/ser.rs +++ b/implementations/rust/src/value/ser.rs @@ -1,4 +1,4 @@ -use crate::value::{Value, value::Record, Map, IOValue}; +use crate::value::{Value, repr::Record, Map, IOValue}; use serde::Serialize; #[derive(Debug)] diff --git a/implementations/rust/src/value/writer.rs b/implementations/rust/src/value/writer.rs index 6aecddf..528cb62 100644 --- a/implementations/rust/src/value/writer.rs +++ b/implementations/rust/src/value/writer.rs @@ -1,7 +1,7 @@ use num::bigint::BigInt; use std::io::Error; use super::signed_integer::SignedIntegerRepr; -use super::value::{Domain, Value, NestedValue, IOValue, UnwrappedIOValue, Float, Double}; +use super::repr::{Domain, Value, NestedValue, IOValue, UnwrappedIOValue, Float, Double}; pub type Result = std::result::Result;