Skip to content

Commit f8d02c3

Browse files
authored
Merge pull request #291 from Fishrock123/fix-http-client-features
Fix http client features
2 parents fc75a59 + cbd2185 commit f8d02c3

File tree

2 files changed

+17
-3
lines changed

2 files changed

+17
-3
lines changed

.github/workflows/ci.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,3 +87,17 @@ jobs:
8787

8888
- name: docs
8989
run: cargo doc --no-deps
90+
91+
check_features:
92+
name: Check feature combinations
93+
runs-on: ubuntu-latest
94+
steps:
95+
- uses: actions/checkout@master
96+
97+
- name: Install cargo-hack
98+
run: cargo install cargo-hack
99+
100+
- name: Check all feature combinations works properly
101+
# * `--feature-powerset` - run for the feature powerset of the package
102+
# * `--no-dev-deps` - build without dev-dependencies to avoid https://github.com/rust-lang/cargo/issues/4866
103+
run: cargo hack check --feature-powerset --no-dev-deps --skip=default-client,wasm-client

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ description = "Surf the web - HTTP client framework"
88
keywords = ["http", "client", "framework", "request", "async"]
99
categories = ["web-programming", "web-programming::http-client"]
1010
authors = [
11-
"Yoshua Wuyts <[email protected]>",
11+
"Yoshua Wuyts <[email protected]>",
1212
"dignifiedquire <[email protected]>",
1313
"Renée Kooi <[email protected]>",
1414
"Jeremiah Senkpiel <[email protected]>"
@@ -21,7 +21,7 @@ edition = "2018"
2121
# `.github/workflows/ci.yaml` are updated accordingly
2222
default = ["curl-client", "middleware-logger", "encoding"]
2323
curl-client = ["http-client/curl_client", "once_cell", "default-client"]
24-
h1-client = ["http-client/h1_client", "default-client"]
24+
h1-client = ["http-client/h1_client", "http-client/native-tls", "default-client"]
2525
hyper-client = ["http-client/hyper_client", "once_cell", "default-client", "async-std/tokio02"]
2626
wasm-client = ["http-client/wasm_client", "default-client"]
2727
default-client = []
@@ -35,7 +35,7 @@ log = { version = "0.4.7", features = ["kv_unstable"] }
3535
mime_guess = "2.0.3"
3636
serde = "1.0.97"
3737
serde_json = "1.0.40"
38-
http-client = { version = "6.1.0", default-features = false }
38+
http-client = { version = "6.3.0", default-features = false }
3939
http-types = "2.5.0"
4040
async-std = { version = "1.6.0", default-features = false, features = ["std"] }
4141
async-trait = "0.1.36"

0 commit comments

Comments
 (0)