Merge branch 'master' of https://github.com/async-graphql/async-graphql

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "async-graphql"
-version = "1.15.1"
+version = "1.15.2"
 authors = ["sunli <scott_s829@163.com>"]
 edition = "2018"
 description = "A GraphQL server library implemented in Rust"

src/scalars/datetime.rs

@@ -5,7 +5,7 @@ use chrono::{DateTime, TimeZone, Utc};
 /// Implement the DateTime<Utc> scalar
 ///
 /// The input/output is a string in RFC3339 format.
-#[Scalar(internal, name = "DateTime")]
+#[Scalar(internal, name = "DateTimeUtc")]
 impl ScalarType for DateTime<Utc> {
     fn parse(value: Value) -> InputValueResult<Self> {
         match value {

src/scalars/mod.rs

@@ -55,10 +55,10 @@ mod tests {
         assert_eq!(<NaiveTime as Type>::type_name(), "NaiveTime");
         assert_eq!(<NaiveTime as Type>::qualified_type_name(), "NaiveTime!");
 
-        assert_eq!(<DateTime::<Utc> as Type>::type_name(), "DateTime");
+        assert_eq!(<DateTime::<Utc> as Type>::type_name(), "DateTimeUtc");
         assert_eq!(
             <DateTime::<Utc> as Type>::qualified_type_name(),
-            "DateTime!"
+            "DateTimeUtc!"
         );
 
         assert_eq!(<Uuid as Type>::type_name(), "UUID");