Skip to content

Commit

Permalink
Revert "Merge pull request http-rs#337 from misuzu/additive-features"
Browse files Browse the repository at this point in the history
This reverts commit 726748d, reversing
changes made to 876912d.
  • Loading branch information
std-microblock committed Jul 24, 2022
1 parent 98beab8 commit bc5e1e0
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -100,4 +100,4 @@ jobs:
- name: Check all feature combinations works properly
# * `--feature-powerset` - run for the feature powerset of the package
# * `--no-dev-deps` - build without dev-dependencies to avoid https://github.com/rust-lang/cargo/issues/4866
run: cargo hack check --feature-powerset --no-dev-deps --skip=default-client,wasm-client
run: cargo hack check --feature-powerset --no-dev-deps --skip=default-client,wasm-client --skip=h1-client,h1-client-rustls
2 changes: 1 addition & 1 deletion src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ impl Config {
}
/// Set TLS Configuration (Native TLS)
#[cfg_attr(feature = "docs", doc(cfg(feature = "h1-client")))]
#[cfg(all(feature = "h1-client", not(feature = "h1-client-rustls")))]
#[cfg(feature = "h1-client")]
pub fn set_tls_config(
mut self,
tls_config: Option<std::sync::Arc<async_native_tls::TlsConnector>>,
Expand Down

0 comments on commit bc5e1e0

Please sign in to comment.