Skip to content

Commit 726748d

Browse files
authored
Merge pull request #337 from misuzu/additive-features
Allow building with `--all-features`
2 parents 876912d + e60727a commit 726748d

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,4 +100,4 @@ jobs:
100100
- name: Check all feature combinations works properly
101101
# * `--feature-powerset` - run for the feature powerset of the package
102102
# * `--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 --skip=h1-client,h1-client-rustls
103+
run: cargo hack check --feature-powerset --no-dev-deps --skip=default-client,wasm-client

src/config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ impl Config {
203203
}
204204
/// Set TLS Configuration (Native TLS)
205205
#[cfg_attr(feature = "docs", doc(cfg(feature = "h1-client")))]
206-
#[cfg(feature = "h1-client")]
206+
#[cfg(all(feature = "h1-client", not(feature = "h1-client-rustls")))]
207207
pub fn set_tls_config(
208208
mut self,
209209
tls_config: Option<std::sync::Arc<async_native_tls::TlsConnector>>,

0 commit comments

Comments
 (0)