Cargo fmt and added Actix-Web in the release.toml

engylemure · engylemure · commit 9aacdbbd242d · 2020-04-10T02:47:25.000-03:00
diff --git a/juniper/release.toml b/juniper/release.toml
@@ -27,4 +27,7 @@ pre-release-replacements = [
   {file="../juniper_warp/Cargo.toml", search="\\[dev-dependencies\\.juniper\\]\nversion = \"[^\"]+\"", replace="[dev-dependencies.juniper]\nversion = \"{{version}}\""},
   # Subscriptions
   {file="../juniper_subscriptions/Cargo.toml", search="juniper = \\{ version = \"[^\"]+\"", replace="juniper = { version = \"{{version}}\""},
+  # Actix-Web
+  {file="../juniper_actix/Cargo.toml", search="juniper = \\{ version = \"[^\"]+\"", replace="juniper = { version = \"{{version}}\""},
+  {file="../juniper_actix/Cargo.toml", search="\\[dev-dependencies\\.juniper\\]\nversion = \"[^\"]+\"", replace="[dev-dependencies.juniper]\nversion = \"{{version}}\""},
 ]
diff --git a/juniper_actix/examples/actix_subscriptions.rs b/juniper_actix/examples/actix_subscriptions.rs
@@ -87,7 +87,16 @@ async fn graphql_subscriptions(
     req: HttpRequest,
 ) -> Result<HttpResponse, Error> {
     let context = Database::new();
-    unsafe { sub_handler(coordinator, context, stream, req, Some(EmptySubscriptionHandler::default())) }.await
+    unsafe {
+        sub_handler(
+            coordinator,
+            context,
+            stream,
+            req,
+            Some(EmptySubscriptionHandler::default()),
+        )
+    }
+    .await
 }
 
 #[actix_rt::main]
diff --git a/juniper_actix/src/lib.rs b/juniper_actix/src/lib.rs
@@ -231,7 +231,9 @@ pub mod subscriptions {
     };
     use futures::{Stream, StreamExt};
     use juniper::{http::GraphQLRequest, InputValue, ScalarValue, SubscriptionCoordinator};
-    use juniper_subscriptions::{message_types::*, MessageTypes, Coordinator, SubscriptionStateHandler, SubscriptionState};
+    use juniper_subscriptions::{
+        message_types::*, Coordinator, MessageTypes, SubscriptionState, SubscriptionStateHandler,
+    };
     use serde::{Deserialize, Serialize};
     use std::{
         collections::HashMap,
@@ -260,7 +262,7 @@ pub mod subscriptions {
             juniper::GraphQLSubscriptionType<S, Context = Context> + Send + Sync + 'static,
         Subscription::TypeInfo: Send + Sync,
         SubHandler: SubscriptionStateHandler<Context, E> + 'static + std::marker::Unpin,
-        E: 'static + std::error::Error + std::marker::Unpin
+        E: 'static + std::error::Error + std::marker::Unpin,
     {
         let mut res = handshake_with_protocols(req, &["graphql-ws"])?;
         Ok(res.streaming(WebsocketContext::create(actor, stream)))
@@ -274,7 +276,7 @@ pub mod subscriptions {
         Context,
         S,
         SubHandler,
-        E
+        E,
     >(
         coordinator: web::Data<Coordinator<'static, Query, Mutation, Subscription, Context, S>>,
         context: Context,
@@ -293,7 +295,7 @@ pub mod subscriptions {
             juniper::GraphQLSubscriptionType<S, Context = Context> + Send + Sync + 'static,
         Subscription::TypeInfo: Send + Sync,
         SubHandler: SubscriptionStateHandler<Context, E> + 'static + std::marker::Unpin,
-        E: 'static + std::error::Error + std::marker::Unpin
+        E: 'static + std::error::Error + std::marker::Unpin,
     {
         start(
             GraphQLWSSession {
@@ -302,7 +304,7 @@ pub mod subscriptions {
                 map_req_id_to_spawn_handle: HashMap::new(),
                 has_started: Arc::new(AtomicBool::new(false)),
                 handler,
-                error_handler: std::marker::PhantomData
+                error_handler: std::marker::PhantomData,
             },
             &req,
             stream,
@@ -321,14 +323,14 @@ pub mod subscriptions {
             juniper::GraphQLSubscriptionType<S, Context = Context> + Send + Sync + 'static,
         Subscription::TypeInfo: Send + Sync,
         SubHandler: SubscriptionStateHandler<Context, E> + 'static + std::marker::Unpin,
-        E: 'static + std::error::Error + std::marker::Unpin
+        E: 'static + std::error::Error + std::marker::Unpin,
     {
         pub map_req_id_to_spawn_handle: HashMap<String, SpawnHandle>,
         pub has_started: Arc<AtomicBool>,
         pub graphql_context: Context,
         pub coordinator: Arc<Coordinator<'static, Query, Mutation, Subscription, Context, S>>,
         pub handler: Option<SubHandler>,
-        error_handler: std::marker::PhantomData<E>
+        error_handler: std::marker::PhantomData<E>,
     }
 
     impl<Query, Mutation, Subscription, Context, S, SubHandler, E> Actor
@@ -344,7 +346,7 @@ pub mod subscriptions {
             juniper::GraphQLSubscriptionType<S, Context = Context> + Send + Sync + 'static,
         Subscription::TypeInfo: Send + Sync,
         SubHandler: SubscriptionStateHandler<Context, E> + 'static + std::marker::Unpin,
-        E: 'static + std::error::Error + std::marker::Unpin
+        E: 'static + std::error::Error + std::marker::Unpin,
     {
         type Context = ws::WebsocketContext<
             GraphQLWSSession<Query, Mutation, Subscription, Context, S, SubHandler, E>,
@@ -365,7 +367,7 @@ pub mod subscriptions {
             juniper::GraphQLSubscriptionType<S, Context = Context> + Send + Sync + 'static,
         Subscription::TypeInfo: Send + Sync,
         SubHandler: SubscriptionStateHandler<Context, E> + 'static + std::marker::Unpin,
-        E: 'static + std::error::Error + std::marker::Unpin
+        E: 'static + std::error::Error + std::marker::Unpin,
     {
         fn gql_connection_ack() -> String {
             format!(r#"{{"type":"{}", "payload": null }}"#, GQL_CONNECTION_ACK)
@@ -476,7 +478,7 @@ pub mod subscriptions {
             juniper::GraphQLSubscriptionType<S, Context = Context> + Send + Sync + 'static,
         Subscription::TypeInfo: Send + Sync,
         SubHandler: SubscriptionStateHandler<Context, E> + 'static + std::marker::Unpin,
-        E: 'static + std::error::Error + std::marker::Unpin
+        E: 'static + std::error::Error + std::marker::Unpin,
     {
         fn handle(&mut self, msg: Result<ws::Message, ws::ProtocolError>, ctx: &mut Self::Context) {
             let msg = match msg {
@@ -493,14 +495,16 @@ pub mod subscriptions {
                     let m = text.trim();
                     let request: WsPayload<S> = match serde_json::from_str(m) {
                         Ok(payload) => payload,
-                        Err(_) => { return; }
+                        Err(_) => {
+                            return;
+                        }
                     };
                     match request.type_ {
                         MessageTypes::GqlConnectionInit => {
                             if let Some(handler) = &self.handler {
                                 let state = SubscriptionState::OnConnection(
                                     Some(String::from(m)),
-                                    &mut self.graphql_context
+                                    &mut self.graphql_context,
                                 );
                                 let on_connect_result = handler.handle(state);
                                 if let Err(_err) = on_connect_result {
@@ -520,7 +524,7 @@ pub mod subscriptions {
                                     ctx.text(Self::gql_connection_ka());
                                 }
                             });
-                        },
+                        }
                         MessageTypes::GqlStart if has_started_value => {
                             let coordinator = self.coordinator.clone();
                             let mut context = self.graphql_context.clone();
@@ -556,9 +560,8 @@ pub mod subscriptions {
                         MessageTypes::GqlStop if has_started_value => {
                             let request_id = request.id.unwrap_or("1".to_owned());
                             if let Some(handler) = &self.handler {
-                                let state = SubscriptionState::OnOperationComplete(
-                                    &self.graphql_context
-                                );
+                                let state =
+                                    SubscriptionState::OnOperationComplete(&self.graphql_context);
                                 handler.handle(state).unwrap();
                             }
                             match self.map_req_id_to_spawn_handle.remove(&request_id) {
@@ -577,14 +580,14 @@ pub mod subscriptions {
                                     // ))
                                 }
                             }
-                        },
+                        }
                         MessageTypes::GqlConnectionTerminate => {
                             if let Some(handler) = &self.handler {
                                 let state = SubscriptionState::OnDisconnect(&self.graphql_context);
                                 handler.handle(state).unwrap();
                             }
                             ctx.stop();
-                        },
+                        }
                         _ => {}
                     }
                 }
diff --git a/juniper_subscriptions/src/lib.rs b/juniper_subscriptions/src/lib.rs
@@ -179,7 +179,7 @@ pub enum MessageTypes {
     /// Client -> Server
     /// Client sends this message in order to stop a running GraphQL operation execution (for example: unsubscribe)
     #[serde(rename = "stop")]
-    GqlStop
+    GqlStop,
 }
 
 /// Subscriptions Protocol Message Type Values
@@ -199,8 +199,9 @@ pub mod message_types {
 
 /// Empty SubscriptionLifeCycleHandler
 pub enum SubscriptionState<'a, Context>
-    where
-        Context: Clone + Send + Sync {
+where
+    Context: Clone + Send + Sync,
+{
     /// The Subscription is at the init of the connection with the client after the
     /// server receives the GQL_CONNECTION_INIT message.
     OnConnection(Option<String>, &'a mut Context),
@@ -211,15 +212,16 @@ pub enum SubscriptionState<'a, Context>
     /// message to the client.
     OnOperationComplete(&'a Context),
     /// The Subscription is terminating the connection with the client.
-    OnDisconnect(&'a Context)
+    OnDisconnect(&'a Context),
 }
 
 /// Trait based on the SubscriptionServer
 /// https://www.apollographql.com/docs/graphql-subscriptions/lifecycle-events/
 pub trait SubscriptionStateHandler<Context, E>
-    where
-        Context: Clone + Send + Sync,
-        E: std::error::Error {
+where
+    Context: Clone + Send + Sync,
+    E: std::error::Error,
+{
     /// This function is called on when the state of the Subscription changes
     /// with the actual state.
     fn handle(&self, _state: SubscriptionState<Context>) -> Result<(), E> {
@@ -231,10 +233,10 @@ pub trait SubscriptionStateHandler<Context, E>
 #[derive(Default)]
 pub struct EmptySubscriptionHandler;
 
-impl<Context> SubscriptionStateHandler<Context, std::io::Error> for EmptySubscriptionHandler
-    where
-        Context: Clone + Send + Sync {}
-
+impl<Context> SubscriptionStateHandler<Context, std::io::Error> for EmptySubscriptionHandler where
+    Context: Clone + Send + Sync
+{
+}
 
 /// Creates [`futures::Stream`] that yields [`GraphQLResponse`]s depending on the given [`Value`]:
 ///

Original file line number	Diff line number	Diff line change
`@@ -27,4 +27,7 @@ pre-release-replacements = [`
`27`	`27`	`{file="../juniper_warp/Cargo.toml", search="\\[dev-dependencies\\.juniper\\]\nversion = \"[^\"]+\"", replace="[dev-dependencies.juniper]\nversion = \"{{version}}\""},`
`28`	`28`	`# Subscriptions`
`29`	`29`	`{file="../juniper_subscriptions/Cargo.toml", search="juniper = \\{ version = \"[^\"]+\"", replace="juniper = { version = \"{{version}}\""},`
	`30`	`+ # Actix-Web`
	`31`	`+ {file="../juniper_actix/Cargo.toml", search="juniper = \\{ version = \"[^\"]+\"", replace="juniper = { version = \"{{version}}\""},`
	`32`	`+ {file="../juniper_actix/Cargo.toml", search="\\[dev-dependencies\\.juniper\\]\nversion = \"[^\"]+\"", replace="[dev-dependencies.juniper]\nversion = \"{{version}}\""},`
`30`	`33`	`]`