Update actix-web

Author: weiznich

wundergraph_bench/Cargo.toml

@@ -7,8 +7,8 @@ authors = ["Georg Semmler <[email protected]>"]
 wundergraph = {path = "../wundergraph", default-features = false, features = ["postgres", "chrono"]}
 diesel = {version = "=1.2.2", features = ["r2d2", "sqlite", "chrono", "postgres"]}
 juniper = "=0.9.2"
-actix = "0.5"
-actix-web = "0.6"
+actix = "0.7"
+actix-web = "0.7"
 failure = "0.1"
 serde = {version = "1", features = ["derive"]}
 serde_json = "1"

wundergraph_bench/src/main.rs

@@ -36,7 +36,7 @@ extern crate futures;
 extern crate num_cpus;
 extern crate serde_json;
 
-use actix::{Actor, Addr, Handler, Message, Syn, SyncArbiter, SyncContext};
+use actix::{Actor, Addr, Handler, Message, SyncArbiter, SyncContext};
 use actix_web::{
     http, server, App, AsyncResponder, FutureResponse, HttpRequest, HttpResponse, Json, State,
 };
@@ -97,26 +97,28 @@ impl Handler<GraphQLData> for GraphQLExecutor {
 }
 
 struct AppState {
-    executor: Addr<Syn, GraphQLExecutor>,
+    executor: Addr<GraphQLExecutor>,
 }
 
 #[cfg_attr(feature = "clippy", allow(needless_pass_by_value))]
-fn graphiql(_req: HttpRequest<AppState>) -> Result<HttpResponse, Error> {
+fn graphiql(_req: &HttpRequest<AppState>) -> Result<HttpResponse, Error> {
     let html = graphiql_source("/graphql");
     Ok(HttpResponse::Ok()
         .content_type("text/html; charset=utf-8")
         .body(html))
 }
 
 #[cfg_attr(feature = "clippy", allow(needless_pass_by_value))]
-fn graphql(st: State<AppState>, data: Json<GraphQLData>) -> FutureResponse<HttpResponse> {
+fn graphql(
+    (st, data): (State<AppState>, Json<GraphQLData>),
+) -> FutureResponse<HttpResponse> {
     st.executor
         .send(data.0)
         .from_err()
         .and_then(|res| match res {
-            Ok(res) => Ok(HttpResponse::Ok()
+            Ok(user) => Ok(HttpResponse::Ok()
                 .content_type("application/json")
-                .body(res)),
+                .body(user)),
             Err(_) => Ok(HttpResponse::InternalServerError().into()),
         })
         .responder()
@@ -151,8 +153,8 @@ fn main() {
         App::with_state(AppState{executor: addr.clone()})
             // enable logger
    //         .middleware(middleware::Logger::default())
-            .resource("/graphql", |r| r.method(http::Method::POST).with2(graphql))
-            .resource("/graphql", |r| r.method(http::Method::GET).with2(graphql))
+            .resource("/graphql", |r| r.method(http::Method::POST).with(graphql))
+            .resource("/graphql", |r| r.method(http::Method::GET).with(graphql))
             .resource("/graphiql", |r| r.method(http::Method::GET).h(graphiql))
             .default_resource(|r| r.get().f(|_| HttpResponse::Found().header("location", "/graphiql").finish()))
     }).workers(num_cpus::get() * 2)

wundergraph_example/Cargo.toml

@@ -8,8 +8,8 @@ license = "MIT OR Apache-2.0"
 diesel = { version = "=1.2.2", features = ["r2d2", "sqlite", "chrono", "postgres"]}
 diesel_migrations = "=1.2.0"
 juniper = "=0.9.2"
-actix = "0.5"
-actix-web = "0.6"
+actix = "0.7"
+actix-web = "0.7"
 indexmap = "1"
 clippy = { version = "0.0.207", optional = true }
 failure = "0.1"

wundergraph_example/src/main.rs

@@ -367,19 +367,19 @@ impl Handler<GraphQLData> for GraphQLExecutor {
 }
 
 struct AppState {
-    executor: Addr<Syn, GraphQLExecutor>,
+    executor: Addr<GraphQLExecutor>,
 }
 
 #[cfg_attr(feature = "clippy", allow(needless_pass_by_value))]
-fn graphiql(_req: HttpRequest<AppState>) -> Result<HttpResponse, Error> {
+fn graphiql(_req: &HttpRequest<AppState>) -> Result<HttpResponse, Error> {
     let html = graphiql_source("/graphql");
     Ok(HttpResponse::Ok()
         .content_type("text/html; charset=utf-8")
         .body(html))
 }
 
 #[cfg_attr(feature = "clippy", allow(needless_pass_by_value))]
-fn graphql(st: State<AppState>, data: Json<GraphQLData>) -> FutureResponse<HttpResponse> {
+fn graphql((st, data): (State<AppState>, Json<GraphQLData>)) -> FutureResponse<HttpResponse> {
     st.executor
         .send(data.0)
         .from_err()
@@ -426,8 +426,8 @@ fn main() {
         App::with_state(AppState{executor: addr.clone()})
             // enable logger
             .middleware(middleware::Logger::default())
-            .resource("/graphql", |r| r.method(http::Method::POST).with2(graphql))
-            .resource("/graphql", |r| r.method(http::Method::GET).with2(graphql))
+            .resource("/graphql", |r| r.method(http::Method::POST).with(graphql))
+            .resource("/graphql", |r| r.method(http::Method::GET).with(graphql))
             .resource("/graphiql", |r| r.method(http::Method::GET).h(graphiql))
             .default_resource(|r| r.get().f(|_| HttpResponse::Found().header("location", "/graphiql").finish()))
     }).bind("127.0.0.1:8000")