Upgrade juniper_warp
to warp
0.1.8 (#271)
This unbreaks the build, as the newer warp deprecates some of the filters we were using and we had `deny_warnings` on.
This commit is contained in:
parent
cf7e8df65f
commit
86fdd25ac7
4 changed files with 13 additions and 6 deletions
7
juniper_warp/CHANGELOG.md
Normal file
7
juniper_warp/CHANGELOG.md
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
# [master]
|
||||||
|
|
||||||
|
- **Breaking Change**: Bump required `warp` version to `0.1.8`.
|
||||||
|
|
||||||
|
# juniper_warp [0.1] 2018-09-13
|
||||||
|
|
||||||
|
- Initial Release
|
|
@ -1,6 +1,6 @@
|
||||||
[package]
|
[package]
|
||||||
name = "juniper_warp"
|
name = "juniper_warp"
|
||||||
version = "0.1.0"
|
version = "0.2.0"
|
||||||
authors = ["Tom Houlé <tom@tomhoule.com>"]
|
authors = ["Tom Houlé <tom@tomhoule.com>"]
|
||||||
description = "Juniper GraphQL integration with Warp"
|
description = "Juniper GraphQL integration with Warp"
|
||||||
license = "BSD-2-Clause"
|
license = "BSD-2-Clause"
|
||||||
|
@ -8,7 +8,7 @@ documentation = "https://docs.rs/juniper_warp"
|
||||||
repository = "https://github.com/graphql-rust/juniper"
|
repository = "https://github.com/graphql-rust/juniper"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
warp = "0.1.2"
|
warp = "0.1.8"
|
||||||
juniper = { path = "../juniper", version = ">=0.9, 0.10.0", default-features = false }
|
juniper = { path = "../juniper", version = ">=0.9, 0.10.0", default-features = false }
|
||||||
serde_json = "1.0.24"
|
serde_json = "1.0.24"
|
||||||
serde_derive = "1.0.75"
|
serde_derive = "1.0.75"
|
||||||
|
|
|
@ -23,7 +23,7 @@ fn main() {
|
||||||
|
|
||||||
let log = log("warp_server");
|
let log = log("warp_server");
|
||||||
|
|
||||||
let homepage = warp::index().map(|| {
|
let homepage = warp::path::end().map(|| {
|
||||||
Response::builder()
|
Response::builder()
|
||||||
.header("content-type", "text/html")
|
.header("content-type", "text/html")
|
||||||
.body(format!(
|
.body(format!(
|
||||||
|
|
|
@ -202,7 +202,7 @@ where
|
||||||
Ok((serde_json::to_vec(&response)?, response.is_ok()))
|
Ok((serde_json::to_vec(&response)?, response.is_ok()))
|
||||||
})
|
})
|
||||||
}).and_then(|result| ::futures::future::done(Ok(build_response(result))))
|
}).and_then(|result| ::futures::future::done(Ok(build_response(result))))
|
||||||
.map_err(|_: tokio_threadpool::BlockingError| warp::reject::server_error()),
|
.map_err(|e: tokio_threadpool::BlockingError| warp::reject::custom(e)),
|
||||||
)
|
)
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -235,7 +235,7 @@ where
|
||||||
Ok((serde_json::to_vec(&response)?, response.is_ok()))
|
Ok((serde_json::to_vec(&response)?, response.is_ok()))
|
||||||
})
|
})
|
||||||
}).and_then(|result| ::futures::future::done(Ok(build_response(result))))
|
}).and_then(|result| ::futures::future::done(Ok(build_response(result))))
|
||||||
.map_err(|_: tokio_threadpool::BlockingError| warp::reject::server_error()),
|
.map_err(|e: tokio_threadpool::BlockingError| warp::reject::custom(e)),
|
||||||
)
|
)
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -434,7 +434,7 @@ mod tests_http_harness {
|
||||||
let schema: Schema = RootNode::new(Database::new(), EmptyMutation::<Database>::new());
|
let schema: Schema = RootNode::new(Database::new(), EmptyMutation::<Database>::new());
|
||||||
|
|
||||||
let state = warp::any().map(move || Database::new());
|
let state = warp::any().map(move || Database::new());
|
||||||
let filter = warp::filters::path::index().and(make_graphql_filter(schema, state.boxed()));
|
let filter = warp::filters::path::end().and(make_graphql_filter(schema, state.boxed()));
|
||||||
|
|
||||||
filter.boxed()
|
filter.boxed()
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue