This commit is contained in:
Koxiaet 2020-10-15 07:39:53 +01:00
parent 93c886af07
commit 7c604c0c7c
6 changed files with 11 additions and 13 deletions

View File

@ -9,8 +9,8 @@ use std::sync::atomic::AtomicUsize;
use std::sync::Arc;
use fnv::FnvHashMap;
use serde::ser::{SerializeSeq, Serializer};
use serde::de::{Deserialize, Deserializer};
use serde::ser::{SerializeSeq, Serializer};
use serde::Serialize;
use crate::extensions::Extensions;
@ -41,7 +41,9 @@ impl Display for Variables {
impl<'de> Deserialize<'de> for Variables {
fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
Ok(Self(<Option<BTreeMap<Name, Value>>>::deserialize(deserializer)?.unwrap_or_default()))
Ok(Self(
<Option<BTreeMap<Name, Value>>>::deserialize(deserializer)?.unwrap_or_default(),
))
}
}
@ -173,12 +175,8 @@ impl<'a> Display for QueryPathNode<'a> {
first = false;
match segment {
QueryPathSegment::Index(idx) => {
write!(f, "{}", *idx)
}
QueryPathSegment::Name(name) => {
write!(f, "{}", name)
}
QueryPathSegment::Index(idx) => write!(f, "{}", *idx),
QueryPathSegment::Name(name) => write!(f, "{}", name),
}
})
}

View File

@ -1,9 +1,9 @@
use std::collections::BTreeMap;
use std::ops::Deref;
use chrono::{DateTime, Utc};
use serde::ser::SerializeMap;
use serde::{Serialize, Serializer};
use chrono::{DateTime, Utc};
use crate::extensions::{Extension, ExtensionContext, ExtensionFactory, ResolveInfo};
use crate::{value, Value, Variables};

View File

@ -13,8 +13,8 @@ use std::any::{Any, TypeId};
use std::collections::BTreeMap;
use crate::context::{QueryPathNode, ResolveId};
use crate::{Data, Request, Result, ServerError, ServerResult, Variables};
use crate::parser::types::ExecutableDocument;
use crate::{Data, Request, Result, ServerError, ServerResult, Variables};
use crate::{Error, Name, Value};
#[cfg(feature = "apollo_tracing")]

View File

@ -3,8 +3,8 @@ use std::collections::BTreeMap;
use tracing::{span, Level, Span};
use crate::extensions::{Extension, ExtensionContext, ExtensionFactory, ResolveInfo};
use crate::{ServerError, Variables};
use crate::parser::types::ExecutableDocument;
use crate::{ServerError, Variables};
/// Tracing extension
///

View File

@ -1,6 +1,6 @@
use chrono_tz::Tz;
use crate::{InputValueError, InputValueResult, Result, ScalarType, Value, Scalar};
use crate::{InputValueError, InputValueResult, Result, Scalar, ScalarType, Value};
#[Scalar(internal, name = "TimeZone")]
impl ScalarType for Tz {

View File

@ -1,7 +1,7 @@
use std::fmt::Display;
use serde::{Deserialize, Serialize};
use num_traits::Num;
use serde::{Deserialize, Serialize};
use crate::{InputValueError, InputValueResult, Scalar, ScalarType, Value};