Skip to content
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.

Sign up for GitHub

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

Jump to bottom

(feat) update hyper to 0.14 #74

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

(feat) update hyper to 0.14 #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8910d88
(feat) update hyper to 0.14
sunng87 Mar 2, 2021
f03da6a
(fix) fix features flags of hyper 0.14 and tokio 1
sunng87 Mar 3, 2021
0a03b01
(fix) add hack to turn on js feature for webassembly
sunng87 Mar 4, 2021
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
11 changes: 8 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ futures = { version = "0.3.8", optional = true }
async-tls = { version = "0.10.0", optional = true }

# hyper_client
hyper = { version = "0.13.6", features = ["tcp"], optional = true }
hyper-tls = { version = "0.4.3", optional = true }
hyper = { version = "0.14.4", features = ["tcp", "client", "stream", "http1", "http2"], optional = true }
hyper-tls = { version = "0.5.0", optional = true }
futures-util = { version = "0.3.5", features = ["io"], optional = true }

# curl_client
Expand Down Expand Up @@ -84,12 +84,17 @@ features = [
"WorkerGlobalScope",
]

[target.'cfg(target_arch = "wasm32")'.dependencies.getrandom]
version = "0.2.2"
features = ["js"]

[dev-dependencies]
async-std = { version = "1.6.0", features = ["unstable", "attributes"] }
portpicker = "0.1.0"
tide = { version = "0.15.0", default-features = false, features = ["h1-server"] }
tide-rustls = { version = "0.1.4" }
tokio = { version = "0.2.21", features = ["macros"] }
tokio = { version = "1", features = ["macros", "time"] }
serde = "1.0"
serde_json = "1.0"
mockito = "0.23.3"
hyper = { version = "0.14.4", features = ["server"] }
2 changes: 1 addition & 1 deletion src/hyper.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ mod tests {
req.set_body("hello");

let client = async move {
tokio::time::delay_for(Duration::from_millis(100)).await;
tokio::time::sleep(Duration::from_millis(100)).await;
let mut resp = client.send(req).await?;
send.send(()).unwrap();
assert_eq!(resp.body_string().await?, "hello");
Expand Down