anna/async-graphql
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #545 from XiNiHa/master

Browse Source 
Update rocket to 0.5.0-rc.1
This commit is contained in:
Sunli 2021-06-16 22:12:23 +08:00 committed by GitHub
commit b253ae6285
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
integrations/rocket/Cargo.toml
View File

@ -16,7 +16,7 @@ categories = ["network-programming", "asynchronous"]
[dependencies]
async-graphql = { path = "../..", version = "=2.9.2" }
rocket = { git = "https://github.com/SergioBenitez/Rocket", rev = "fa3e033", default-features = false } # TODO: Change to Cargo crate when Rocket 0.5.0 is released
rocket = { version = "0.5.0-rc.1", default-features = false }
serde = "1.0.126"
serde_json = "1.0.64"
tokio-util = { version = "0.6.7", default-features = false, features = ["compat"] }

10
integrations/rocket/src/lib.rs
View File

@ -56,10 +56,7 @@ impl BatchRequest {
impl<'r> FromData<'r> for BatchRequest {
type Error = ParseRequestError;
async fn from_data(
req: &'r rocket::Request<'_>,
data: Data,
) -> data::Outcome<Self, Self::Error> {
async fn from_data(req: &'r rocket::Request<'_>, data: Data<'r>) -> data::Outcome<'r, Self> {
let opts: MultipartOptions = req.rocket().state().copied().unwrap_or_default();
let request = async_graphql::http::receive_batch_body(
@ -177,10 +174,7 @@ impl Query {
impl<'r> FromData<'r> for Request {
type Error = ParseRequestError;
async fn from_data(
req: &'r rocket::Request<'_>,
data: Data,
) -> data::Outcome<Self, Self::Error> {
async fn from_data(req: &'r rocket::Request<'_>, data: Data<'r>) -> data::Outcome<'r, Self> {
BatchRequest::from_data(req, data)
.await
.and_then(|request| match request.0.into_single() {