Skip to content

Refactor to make "special" type machinery more reusable #479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 11, 2018
Merged

Refactor to make "special" type machinery more reusable #479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 5 additions & 15 deletions src/ser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ use ryu;
#[cfg(feature = "arbitrary_precision")]
use serde::Serialize;

#[cfg(feature = "arbitrary_precision")]
use number::{SERDE_STRUCT_FIELD_NAME, SERDE_STRUCT_NAME};

/// A structure for serializing Rust values into JSON.
pub struct Serializer<W, F = CompactFormatter> {
writer: W,
Expand Down Expand Up @@ -461,19 +458,12 @@ where
}
}

#[cfg(not(feature = "arbitrary_precision"))]
#[inline]
fn serialize_struct(self, _name: &'static str, len: usize) -> Result<Self::SerializeStruct> {
self.serialize_map(Some(len))
}

#[cfg(feature = "arbitrary_precision")]
#[inline]
fn serialize_struct(self, name: &'static str, len: usize) -> Result<Self::SerializeStruct> {
if name == SERDE_STRUCT_NAME {
Ok(Compound::Number { ser: self })
} else {
self.serialize_map(Some(len))
match name {
#[cfg(feature = "arbitrary_precision")]
::number::SERDE_STRUCT_NAME => Ok(Compound::Number { ser: self }),
_ => self.serialize_map(Some(len)),
}
}

Expand Down Expand Up @@ -820,7 +810,7 @@ where
}
#[cfg(feature = "arbitrary_precision")]
Compound::Number { ref mut ser, .. } => {
if key == SERDE_STRUCT_FIELD_NAME {
if key == ::number::SERDE_STRUCT_FIELD_NAME {
try!(value.serialize(NumberStrEmitter(&mut *ser)));
Ok(())
} else {
Expand Down
84 changes: 33 additions & 51 deletions src/value/de.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,10 @@ use map::Map;
use number::Number;
use value::Value;

#[cfg(feature = "arbitrary_precision")]
use serde::de;

#[cfg(feature = "arbitrary_precision")]
use number::{NumberFromString, SERDE_STRUCT_FIELD_NAME};
use number::NumberFromString;

impl<'de> Deserialize<'de> for Value {
#[inline]
Expand Down Expand Up @@ -109,44 +108,28 @@ impl<'de> Deserialize<'de> for Value {
Ok(Value::Array(vec))
}

#[cfg(not(feature = "arbitrary_precision"))]
fn visit_map<V>(self, mut visitor: V) -> Result<Value, V::Error>
where
V: MapAccess<'de>,
{
let mut values = Map::new();

while let Some((key, value)) = try!(visitor.next_entry()) {
values.insert(key, value);
}

Ok(Value::Object(values))
}

#[cfg(feature = "arbitrary_precision")]
fn visit_map<V>(self, mut visitor: V) -> Result<Value, V::Error>
where
V: MapAccess<'de>,
{
let mut key = String::new();
let number = visitor.next_key_seed(NumberOrObject { key: &mut key })?;
match number {
Some(true) => {
match visitor.next_key_seed(KeyClassifier)? {
#[cfg(feature = "arbitrary_precision")]
Some(KeyClass::Number) => {
let number: NumberFromString = visitor.next_value()?;
return Ok(Value::Number(number.value));
}
None => return Ok(Value::Object(Map::new())),
Some(false) => {}
}
Some(KeyClass::Map(first_key)) => {
let mut values = Map::new();

let mut values = Map::new();
values.insert(first_key, try!(visitor.next_value()));
while let Some((key, value)) = try!(visitor.next_entry()) {
values.insert(key, value);
}

values.insert(key, try!(visitor.next_value()));
while let Some((key, value)) = try!(visitor.next_entry()) {
values.insert(key, value);
Ok(Value::Object(values))
}
None => return Ok(Value::Object(Map::new())),
}

Ok(Value::Object(values))
}
}

Expand Down Expand Up @@ -1303,14 +1286,16 @@ impl<'de> serde::Deserializer<'de> for MapKeyDeserializer<'de> {
}
}

#[cfg(feature = "arbitrary_precision")]
struct NumberOrObject<'a> {
key: &'a mut String,
struct KeyClassifier;

enum KeyClass {
Map(String),
#[cfg(feature = "arbitrary_precision")]
Number,
}

#[cfg(feature = "arbitrary_precision")]
impl<'a, 'de> DeserializeSeed<'de> for NumberOrObject<'a> {
type Value = bool;
impl<'de> DeserializeSeed<'de> for KeyClassifier {
type Value = KeyClass;

fn deserialize<D>(self, deserializer: D) -> Result<Self::Value, D::Error>
where
Expand All @@ -1320,35 +1305,32 @@ impl<'a, 'de> DeserializeSeed<'de> for NumberOrObject<'a> {
}
}

#[cfg(feature = "arbitrary_precision")]
impl<'a, 'de> Visitor<'de> for NumberOrObject<'a> {
type Value = bool;
impl<'de> Visitor<'de> for KeyClassifier {
type Value = KeyClass;

fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
formatter.write_str("a string key")
}

fn visit_str<E>(self, s: &str) -> Result<bool, E>
fn visit_str<E>(self, s: &str) -> Result<Self::Value, E>
where
E: de::Error,
{
if s == SERDE_STRUCT_FIELD_NAME {
Ok(true)
} else {
self.key.push_str(s);
Ok(false)
match s {
#[cfg(feature = "arbitrary_precision")]
::number::SERDE_STRUCT_FIELD_NAME => Ok(KeyClass::Number),
_ => Ok(KeyClass::Map(s.to_owned())),
}
}

fn visit_string<E>(self, s: String) -> Result<bool, E>
fn visit_string<E>(self, s: String) -> Result<Self::Value, E>
where
E: de::Error,
{
if s == SERDE_STRUCT_FIELD_NAME {
Ok(true)
} else {
*self.key = s;
Ok(false)
match s.as_str() {
#[cfg(feature = "arbitrary_precision")]
::number::SERDE_STRUCT_FIELD_NAME => Ok(KeyClass::Number),
_ => Ok(KeyClass::Map(s)),
}
}
}
Expand Down
23 changes: 5 additions & 18 deletions src/value/ser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ use value::{to_value, Value};
#[cfg(feature = "arbitrary_precision")]
use serde::ser;

#[cfg(feature = "arbitrary_precision")]
use number::{SERDE_STRUCT_FIELD_NAME, SERDE_STRUCT_NAME};

impl Serialize for Value {
#[inline]
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
Expand Down Expand Up @@ -228,25 +225,15 @@ impl serde::Serializer for Serializer {
})
}

#[cfg(not(feature = "arbitrary_precision"))]
fn serialize_struct(
self,
_name: &'static str,
len: usize,
) -> Result<Self::SerializeStruct, Error> {
self.serialize_map(Some(len))
}

#[cfg(feature = "arbitrary_precision")]
fn serialize_struct(
self,
name: &'static str,
len: usize,
) -> Result<Self::SerializeStruct, Error> {
if name == SERDE_STRUCT_NAME {
Ok(SerializeMap::Number { out_value: None })
} else {
self.serialize_map(Some(len))
match name {
#[cfg(feature = "arbitrary_precision")]
::number::SERDE_STRUCT_NAME => Ok(SerializeMap::Number { out_value: None }),
_ => self.serialize_map(Some(len)),
}
}

Expand Down Expand Up @@ -605,7 +592,7 @@ impl serde::ser::SerializeStruct for SerializeMap {
}
#[cfg(feature = "arbitrary_precision")]
SerializeMap::Number { ref mut out_value } => {
if key == SERDE_STRUCT_FIELD_NAME {
if key == ::number::SERDE_STRUCT_FIELD_NAME {
*out_value = Some(value.serialize(NumberValueEmitter)?);
Ok(())
} else {
Expand Down