Update dependencies

Cargo.toml

@@ -22,5 +22,5 @@ members = [
     "tide/token-from-header",
     "tide/dataloader",
 
-    #"rocket/starwars",
+    "rocket/starwars",
 ]

actix-web/error-extensions/Cargo.toml

@@ -5,9 +5,9 @@ authors = ["sunli <scott_s829@163.com>"]
 edition = "2018"
 
 [dependencies]
-async-graphql = "2.0.0"
-async-graphql-actix-web = "2.0.0"
+async-graphql = { path = "../../..", version = "2.0.0" }
+async-graphql-actix-web = { path = "../../../integrations/actix-web", version = "2.0.0" }
 actix-web = "3.0.0"
 actix-rt = "1.1.0"
 thiserror = "1.0"
-serde_json = "1.0"
+serde_json = "1.0"

actix-web/starwars/Cargo.toml

@@ -5,8 +5,8 @@ authors = ["sunli <scott_s829@163.com>"]
 edition = "2018"
 
 [dependencies]
-async-graphql = "2.0.0"
-async-graphql-actix-web = "2.0.0"
+async-graphql = { path = "../../..", version = "2.0.0" }
+async-graphql-actix-web = { path = "../../../integrations/actix-web", version = "2.0.0" }
 actix-web = "3.0.0"
 actix-rt = "1.1.0"
-starwars = { path = "../../models/starwars" }
+starwars = { path = "../../models/starwars" }

actix-web/subscription/Cargo.toml

@@ -5,9 +5,9 @@ authors = ["sunli <scott_s829@163.com>"]
 edition = "2018"
 
 [dependencies]
-async-graphql = "2.0.0"
-async-graphql-actix-web = "2.0.0"
+async-graphql = { path = "../../..", version = "2.0.0" }
+async-graphql-actix-web = { path = "../../../integrations/actix-web", version = "2.0.0" }
 actix-web = "3.0.0"
 actix-rt = "1.1.0"
 actix-web-actors = "3.0.0"
-books = { path = "../../models/books" }
+books = { path = "../../models/books" }

actix-web/token-from-header/Cargo.toml

@@ -5,12 +5,12 @@ authors = ["sunli <scott_s829@163.com>"]
 edition = "2018"
 
 [dependencies]
-async-graphql = "2.0.0"
-async-graphql-actix-web = "2.0.0"
+async-graphql = { path = "../../..", version = "2.0.0" }
+async-graphql-actix-web = { path = "../../../integrations/actix-web", version = "2.0.0" }
 actix-web = "3.0.0"
 actix-rt = "1.1.0"
 futures = "0.3"
 actix-web-actors = "3.0.0"
 serde_json = "1.0"
 serde_derive = "1.0"
-serde = "1.0"
+serde = "1.0"

actix-web/upload/Cargo.toml

@@ -5,8 +5,8 @@ authors = ["sunli <scott_s829@163.com>"]
 edition = "2018"
 
 [dependencies]
-async-graphql = "2.0.0"
-async-graphql-actix-web = "2.0.0"
+async-graphql = { path = "../../..", version = "2.0.0" }
+async-graphql-actix-web = { path = "../../../integrations/actix-web", version = "2.0.0" }
 actix-web = "3.0.0"
 actix-rt = "1.1.0"
-files = { path = "../../models/files" }
+files = { path = "../../models/files" }

federation/federation-accounts/Cargo.toml

@@ -5,7 +5,7 @@ authors = ["sunli <scott_s829@163.com>"]
 edition = "2018"
 
 [dependencies]
-async-graphql = "2.0.0"
-async-graphql-warp = "2.0.0"
-tokio = { version = "0.2", features = ["macros"] }
-warp = "0.2"
+async-graphql = { path = "../../..", version = "2.0.0" }
+async-graphql-warp = { path = "../../../integrations/warp", version = "2.0.0" }
+tokio = { version = "0.3.0", features = ["macros", "rt-multi-thread"] }
+warp = "0.2"

federation/federation-products/Cargo.toml

@@ -5,7 +5,7 @@ authors = ["sunli <scott_s829@163.com>"]
 edition = "2018"
 
 [dependencies]
-async-graphql = "2.0.0"
-async-graphql-warp = "2.0.0"
-tokio = { version = "0.2", features = ["macros"] }
-warp = "0.2"
+async-graphql = { path = "../../..", version = "2.0.0" }
+async-graphql-warp = { path = "../../../integrations/warp", version = "2.0.0" }
+tokio = { version = "0.3.0", features = ["macros", "rt-multi-thread"] }
+warp = "0.2"

federation/federation-reviews/Cargo.toml

@@ -5,7 +5,7 @@ authors = ["sunli <scott_s829@163.com>"]
 edition = "2018"
 
 [dependencies]
-async-graphql = "2.0.0"
-async-graphql-warp = "2.0.0"
-tokio = { version = "0.2", features = ["macros"] }
-warp = "0.2"
+async-graphql = { path = "../../..", version = "2.0.0" }
+async-graphql-warp = { path = "../../../integrations/warp", version = "2.0.0" }
+tokio = { version = "0.3.0", features = ["macros", "rt-multi-thread"] }
+warp = "0.2"

models/books/Cargo.toml

@@ -5,8 +5,8 @@ authors = ["sunli <scott_s829@163.com>"]
 edition = "2018"
 
 [dependencies]
-async-graphql = "2.0.0"
+async-graphql = { path = "../../..", version = "2.0.0" }
 slab = "0.4.2"
-tokio = { version = "0.2", features = ["time", "stream"] }
+tokio = { version = "0.3.0", features = ["time", "stream"] }
 futures = "0.3.0"
-once_cell = "1.0"
+once_cell = "1.0"

models/files/Cargo.toml

@@ -5,6 +5,6 @@ authors = ["sunli <scott_s829@163.com>"]
 edition = "2018"
 
 [dependencies]
-async-graphql = "2.0.0"
+async-graphql = { path = "../../..", version = "2.0.0" }
 slab = "0.4.2"
-futures = "0.3.0"
+futures = "0.3.0"

models/files/src/lib.rs

@@ -35,7 +35,7 @@ impl MutationRoot {
         let info = FileInfo {
             id: entry.key().into(),
             filename: upload.filename.clone(),
-            mimetype: upload.content_type.clone(),
+            mimetype: upload.content_type,
         };
         entry.insert(info.clone());
         info

models/starwars/Cargo.toml

@@ -5,5 +5,5 @@ authors = ["sunli <scott_s829@163.com>"]
 edition = "2018"
 
 [dependencies]
-async-graphql = "2.0.0"
+async-graphql = { path = "../../..", version = "2.0.0" }
 slab = "0.4.2"

rocket/starwars/Cargo.toml

@@ -5,7 +5,7 @@ authors = ["Daniel Wiesenberg <daniel@simplificAR.io>"]
 edition = "2018"
 
 [dependencies]
-async-graphql = "2.0.0"
-async-graphql-rocket = "2.0.0"
-rocket = { git = "https://github.com/SergioBenitez/Rocket/", rev = "dc2c6ec", default-features = false } #TODO: Change to Cargo crate, when Rocket 0.5.0 is released
+async-graphql = { path = "../../..", version = "2.0.3" }
+async-graphql-rocket = { path = "../../../integrations/rocket", version = "2.0.3" }
+rocket = { git = "https://github.com/SergioBenitez/Rocket/", rev = "8da034a", default-features = false } # TODO: Change to Cargo crate when Rocket 0.5.0 is released
 starwars = { path = "../../models/starwars" }

rocket/starwars/src/main.rs

@@ -2,8 +2,8 @@ use async_graphql::{
     http::{playground_source, GraphQLPlaygroundConfig},
     EmptyMutation, EmptySubscription, Schema,
 };
-use async_graphql_rocket::{GraphQL, Request, Response};
-use rocket::{http::Status, response::content, routes, State};
+use async_graphql_rocket::{Request, Response};
+use rocket::{response::content, routes, State};
 use starwars::{QueryRoot, StarWars};
 
 pub type StarWarsSchema = Schema<QueryRoot, EmptyMutation, EmptySubscription>;
@@ -14,18 +14,12 @@ fn graphql_playground() -> content::Html<String> {
 }
 
 #[rocket::post("/?<query..>")]
-async fn graphql_query(
-    schema: State<'_, StarWarsSchema>,
-    query: Request,
-) -> Result<Response, Status> {
+async fn graphql_query(schema: State<'_, StarWarsSchema>, query: Request) -> Response {
     query.execute(&schema).await
 }
 
 #[rocket::post("/", data = "<request>", format = "application/json")]
-async fn graphql_request(
-    schema: State<'_, StarWarsSchema>,
-    request: Request,
-) -> Result<Response, Status> {
+async fn graphql_request(schema: State<'_, StarWarsSchema>, request: Request) -> Response {
     request.execute(&schema).await
 }
 
@@ -35,7 +29,7 @@ fn rocket() -> rocket::Rocket {
         .data(StarWars::new())
         .finish();
 
-    rocket::ignite().attach(GraphQL::fairing(schema)).mount(
+    rocket::ignite().manage(schema).mount(
         "/",
         routes![graphql_query, graphql_request, graphql_playground],
     )

tide/dataloader/Cargo.toml

@@ -5,8 +5,8 @@ authors = ["vkill <vkill.net@gmail.com>"]
 edition = "2018"
 
 [dependencies]
-async-graphql = "2.0.0"
-async-graphql-tide = "2.0.0"
+async-graphql = { path = "../../..", version = "2.0.0" }
+async-graphql-tide = { path = "../../../integrations/tide", version = "2.0.0" }
 tide = "0.13"
 async-std = "1.5.0"
 dataloader = "0.12.0"

tide/starwars/Cargo.toml

@@ -5,8 +5,8 @@ authors = ["vkill <vkill.net@gmail.com>"]
 edition = "2018"
 
 [dependencies]
-async-graphql = "2.0.0"
-async-graphql-tide = "2.0.0"
+async-graphql = { path = "../../..", version = "2.0.0" }
+async-graphql-tide = { path = "../../../integrations/tide", version = "2.0.0" }
 tide = "0.13"
 async-std = "1.5.0"
 starwars = { path = "../../models/starwars" }

tide/token-from-header/Cargo.toml

@@ -5,8 +5,8 @@ authors = ["vkill <vkill.net@gmail.com>"]
 edition = "2018"
 
 [dependencies]
-async-graphql = "2.0.0"
-async-graphql-tide = "2.0.0"
+async-graphql = { path = "../../..", version = "2.0.0" }
+async-graphql-tide = { path = "../../../integrations/tide", version = "2.0.0" }
 tide = "0.13"
 async-std = "1.5.0"
 

tide/token-from-header/src/main.rs

@@ -43,7 +43,7 @@ async fn run() -> Result<()> {
 
             let mut req = async_graphql_tide::receive_request(req).await?;
             if let Some(token) = token {
-                req = req.data(MyToken(token.clone()));
+                req = req.data(MyToken(token));
             }
             async_graphql_tide::respond(schema.execute(req).await)
         }

warp/starwars/Cargo.toml

@@ -5,9 +5,9 @@ authors = ["sunli <scott_s829@163.com>"]
 edition = "2018"
 
 [dependencies]
-async-graphql = "2.0.0"
-async-graphql-warp = "2.0.0"
-tokio = { version = "0.2", features = ["macros"] }
+async-graphql = { path = "../../..", version = "2.0.0" }
+async-graphql-warp = { path = "../../../integrations/warp", version = "2.0.0" }
+tokio = { version = "0.3.0", features = ["macros", "rt-multi-thread"] }
 warp = "0.2"
 starwars = { path = "../../models/starwars" }
 http = "0.2"

warp/subscription/Cargo.toml

@@ -5,8 +5,8 @@ authors = ["sunli <scott_s829@163.com>"]
 edition = "2018"
 
 [dependencies]
-async-graphql = "2.0.0"
-async-graphql-warp = "2.0.0"
-tokio = { version = "0.2", features = ["macros"] }
+async-graphql = { path = "../../..", version = "2.0.0" }
+async-graphql-warp = { path = "../../../integrations/warp", version = "2.0.0" }
+tokio = { version = "0.3.0", features = ["macros", "rt-multi-thread"] }
 warp = "0.2"
 books = { path = "../../models/books" }

warp/token-from-header/Cargo.toml

@@ -5,9 +5,9 @@ authors = ["sunli <scott_s829@163.com>"]
 edition = "2018"
 
 [dependencies]
-async-graphql = "2.0.0"
-async-graphql-warp = "2.0.0"
-tokio = { version = "0.2", features = ["macros"] }
+async-graphql = { path = "../../..", version = "2.0.0" }
+async-graphql-warp = { path = "../../../integrations/warp", version = "2.0.0" }
+tokio = { version = "0.3.0", features = ["macros", "rt-multi-thread"] }
 warp = "0.2"
 serde_json = "1.0"
 serde_derive = "1.0"