Skip to content
This repository was archived by the owner on Jun 21, 2020. It is now read-only.

fix: sync up with nightly futures_api #14

Merged
merged 2 commits into from
Apr 17, 2019
Merged

fix: sync up with nightly futures_api #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1b5c9c
update deps, sync up with nightly futures_api
prasannavl Apr 16, 2019
d07f094
update deps
prasannavl Apr 16, 2019
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
6 changes: 3 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ version = "0.1.4"
members = ["http-service-hyper", "http-service-mock"]

[dependencies]
bytes = "0.4.11"
http = "0.1.13"
bytes = "0.4.12"
http = "0.1.17"

[dependencies.futures-preview]
version = "0.3.0-alpha.13"
version = "0.3.0-alpha.14"
4 changes: 2 additions & 2 deletions http-service-hyper/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ version = "0.1.0"
[dependencies]
http = "0.1"
http-service = "0.1.4"
hyper = "0.12.24"
hyper = "0.12.27"

[dependencies.futures-preview]
features = ["compat"]
version = "0.3.0-alpha.13"
version = "0.3.0-alpha.14"
2 changes: 1 addition & 1 deletion http-service-mock/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ version = "0.1.0"
http-service = "0.1.4"

[dependencies.futures-preview]
version = "0.3.0-alpha.13"
version = "0.3.0-alpha.14"
6 changes: 3 additions & 3 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use futures::{
future,
prelude::*,
stream::{self, StreamObj},
task::Waker,
task::Context,
Poll,
};

Expand Down Expand Up @@ -62,8 +62,8 @@ impl Unpin for Body {}

impl Stream for Body {
type Item = Result<Bytes, std::io::Error>;
fn poll_next(mut self: Pin<&mut Self>, waker: &Waker) -> Poll<Option<Self::Item>> {
Pin::new(&mut self.stream).poll_next(waker)
fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<Option<Self::Item>> {
Pin::new(&mut self.stream).poll_next(cx)
}
}

Expand Down