graphql-rust · tyranron · Mar 4, 2022 · Dec 20, 2021 · Dec 20, 2021 · Dec 20, 2021
diff --git a/docs/book/content/types/scalars.md b/docs/book/content/types/scalars.md
@@ -35,7 +35,8 @@ Juniper has built-in support for a few additional types from common third party
 crates. They are enabled via features that are on by default.
 
 * uuid::Uuid
-* chrono::DateTime
+* chrono::{DateTime, NaiveDate, NaiveDateTime, NaiveTime}
+* chrono_tz::Tz;
 * time::{Date, OffsetDateTime, PrimitiveDateTime, Time, UtcOffset}
 * url::Url
 * bson::oid::ObjectId

diff --git a/examples/actix_subscriptions/Cargo.toml b/examples/actix_subscriptions/Cargo.toml
@@ -6,8 +6,8 @@ authors = ["Mihai Dinculescu <[email protected]>"]
 publish = false
 
 [dependencies]
-actix-web = "4.0.0-beta.12"
-actix-cors = "0.6.0-beta.4"
+actix-web = "4.0"
+actix-cors = "0.6"
 futures = "0.3"
 env_logger = "0.9"
 serde = "1.0"

diff --git a/examples/actix_subscriptions/src/main.rs b/examples/actix_subscriptions/src/main.rs
@@ -136,7 +136,7 @@ async fn main() -> std::io::Result<()> {
                     .route(web::get().to(graphql)),
             )
             .service(web::resource("/playground").route(web::get().to(playground)))
-            .default_service(web::route().to(|| {
+            .default_service(web::to(|| async {
                 HttpResponse::Found()
                     .append_header((header::LOCATION, "/playground"))
                     .finish()

diff --git a/juniper/CHANGELOG.md b/juniper/CHANGELOG.md
@@ -29,6 +29,9 @@
   - Mirror `#[derive(GraphQLScalar)]` macro.
   - Support usage on type aliases in case `#[derive(GraphQLScalar)]` isn't applicable because of [orphan rules](https://doc.rust-lang.org/reference/items/implementations.html#orphan-rules).
 - Rename `ScalarValue::as_boolean` to `ScalarValue::as_bool`. ([#1025](https://github.com/graphql-rust/juniper/pull/1025))
+- Change [`chrono` crate](https://docs.rs/chrono) GraphQL scalars according to the [graphql-scalars.dev](https://graphql-scalars.dev). ([#1010](https://github.com/graphql-rust/juniper/pull/1010))
+- Disable `chrono` feature by default. ([#1010](https://github.com/graphql-rust/juniper/pull/1010))
+- Remove `scalar-naivetime` feature. ([#1010](https://github.com/graphql-rust/juniper/pull/1010))
 
 ## Features
 

diff --git a/juniper/Cargo.toml b/juniper/Cargo.toml
@@ -21,14 +21,13 @@ travis-ci = { repository = "graphql-rust/juniper" }
 [features]
 default = [
     "bson",
-    "chrono",
     "schema-language",
     "url",
     "uuid",
 ]
+chrono-clock = ["chrono", "chrono/clock"]
 expose-test-schema = ["anyhow", "serde_json"]
 graphql-parser-integration = ["graphql-parser"]
-scalar-naivetime = []
 schema-language = ["graphql-parser-integration"]
 
 [dependencies]

diff --git a/juniper/src/integrations/bson.rs b/juniper/src/integrations/bson.rs
@@ -1,7 +1,5 @@
 //! GraphQL support for [bson](https://github.com/mongodb/bson-rust) types.
 
-use chrono::prelude::*;
-
 use crate::{graphql_scalar, InputValue, ScalarValue, Value};
 
 #[graphql_scalar(with = object_id, parse_token(String))]
@@ -30,17 +28,16 @@ mod utc_date_time {
     use super::*;
 
     pub(super) fn to_output<S: ScalarValue>(v: &UtcDateTime) -> Value<S> {
-        Value::scalar((*v).to_chrono().to_rfc3339())
+        Value::scalar((*v).to_rfc3339_string())
     }
 
     pub(super) fn from_input<S: ScalarValue>(v: &InputValue<S>) -> Result<UtcDateTime, String> {
         v.as_string_value()
             .ok_or_else(|| format!("Expected `String`, found: {}", v))
             .and_then(|s| {
-                s.parse::<DateTime<Utc>>()
+                UtcDateTime::parse_rfc3339_str(s)
                     .map_err(|e| format!("Failed to parse `UtcDateTime`: {}", e))
             })
-            .map(UtcDateTime::from_chrono)
     }
 }