yume/juniper
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'serde-1.0' of https://github.com/zaeleus/juniper into zaeleus-serde-1.0

Browse source 
# Conflicts:
#	Cargo.toml
This commit is contained in:
Magnus Hallin 2017-06-14 09:05:56 +02:00
commit 41a33a3238
2 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Cargo.toml
View file

@ -25,13 +25,12 @@ iron-handlers = ["iron", "serde_json", "urlencoded"]
expose-test-schema = []
[dependencies]
serde = { version = "^0.9.1" }
serde_derive = {version="^0.9.1" }
serde = { version = "^1.0.8" }
serde_derive = {version="^1.0.8" }
iron = { version = "^0.5.1", optional = true }
serde_json = {version ="^0.9.1", optional = true }
urlencoded = {version="0.5", optional=true}
serde_json = { version = "^1.0.2", optional = true }
urlencoded = { version = "^0.5.0", optional = true }
[dev-dependencies]
iron = "^0.5.1"

31
src/integrations/serde.rs
View file

@ -50,13 +50,13 @@ impl<'a> ser::Serialize for GraphQLError<'a> {
}
}
impl de::Deserialize for InputValue {
impl<'de> de::Deserialize<'de> for InputValue {
fn deserialize<D>(deserializer: D) -> Result<InputValue, D::Error>
where D: de::Deserializer,
where D: de::Deserializer<'de>,
{
struct InputValueVisitor;
impl de::Visitor for InputValueVisitor {
impl<'de> de::Visitor<'de> for InputValueVisitor {
type Value = InputValue;
fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
@ -99,23 +99,32 @@ impl de::Deserialize for InputValue {
Ok(InputValue::null())
}
fn visit_seq<V>(self, visitor: V) -> Result<InputValue, V::Error>
where V: de::SeqVisitor,
fn visit_seq<V>(self, mut visitor: V) -> Result<InputValue, V::Error>
where V: de::SeqAccess<'de>,
{
let values = try!(de::impls::VecVisitor::new().visit_seq(visitor));
let mut values = Vec::new();
while let Some(el) = try!(visitor.next_element()) {
values.push(el);
}
Ok(InputValue::list(values))
}
fn visit_map<V>(self, visitor: V) -> Result<InputValue, V::Error>
where V: de::MapVisitor,
fn visit_map<V>(self, mut visitor: V) -> Result<InputValue, V::Error>
where V: de::MapAccess<'de>,
{
let values = try!(de::impls::HashMapVisitor::<String, InputValue, _>::new()
.visit_map(visitor));
let mut values: HashMap<String, InputValue> = HashMap::new();
while let Some((key, value)) = try!(visitor.next_entry()) {
values.insert(key, value);
}
Ok(InputValue::object(values))
}
}
deserializer.deserialize(InputValueVisitor)
deserializer.deserialize_any(InputValueVisitor)
}
}