Skip to content

Upgrade juniper_warp to warp 0.1.8 #271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 28, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions juniper_warp/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# [master]

- **Breaking Change**: Bump required `warp` version to `0.1.8`.

# juniper_warp [0.1] 2018-09-13

- Initial Release
4 changes: 2 additions & 2 deletions juniper_warp/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[package]
name = "juniper_warp"
version = "0.1.0"
version = "0.2.0"
authors = ["Tom Houlé <[email protected]>"]
description = "Juniper GraphQL integration with Warp"
license = "BSD-2-Clause"
documentation = "https://docs.rs/juniper_warp"
repository = "https://github.com/graphql-rust/juniper"

[dependencies]
warp = "0.1.2"
warp = "0.1.8"
juniper = { path = "../juniper", version = ">=0.9, 0.10.0", default-features = false }
serde_json = "1.0.24"
serde_derive = "1.0.75"
Expand Down
2 changes: 1 addition & 1 deletion juniper_warp/examples/warp_server/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ fn main() {

let log = log("warp_server");

let homepage = warp::index().map(|| {
let homepage = warp::path::end().map(|| {
Response::builder()
.header("content-type", "text/html")
.body(format!(
Expand Down
6 changes: 3 additions & 3 deletions juniper_warp/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ where
Ok((serde_json::to_vec(&response)?, response.is_ok()))
})
}).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)),
)
};

Expand Down Expand Up @@ -235,7 +235,7 @@ where
Ok((serde_json::to_vec(&response)?, response.is_ok()))
})
}).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)),
)
};

Expand Down Expand Up @@ -434,7 +434,7 @@ mod tests_http_harness {
let schema: Schema = RootNode::new(Database::new(), EmptyMutation::<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()
}
Expand Down