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

awc: gate TlsConnectorService behind any feature that uses it #3350

Merged
merged 3 commits into from
May 14, 2024
Merged

awc: gate TlsConnectorService behind any feature that uses it #3350

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
8fe8ae8
awc: gate TlsConnectorService behind any feature that uses it
asonix May 4, 2024
c57ba6f
Add CHANGES entry about 1.78 compile warning
asonix May 4, 2024
c7b332b
Merge branch 'master' into asonix/fix-unused-struct-warning
asonix May 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions awc/CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## Unreleased

- Minimum supported Rust version (MSRV) is now 1.72.
- Fix warning on 1.78 due to unused TlsConnectorService struct

## 3.4.0

Expand Down
16 changes: 16 additions & 0 deletions awc/src/client/connector.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,6 +649,14 @@

/// service for establish tcp connection and do client tls handshake.
/// operation is canceled when timeout limit reached.
#[cfg(any(

Check failure on line 652 in awc/src/client/connector.rs

View workflow job for this annotation

GitHub Actions / public-api-diff 

struct `TlsConnectorService` is never constructed
feature = "dangerous-h2c",
feature = "openssl",
feature = "rustls-0_20",
feature = "rustls-0_21",
feature = "rustls-0_22-webpki-roots",
feature = "rustls-0_22-native-roots",
))]
struct TlsConnectorService<Tcp, Tls> {
/// TCP connection is canceled on `TcpConnectorInnerService`'s timeout setting.
tcp_service: Tcp,
Expand All @@ -659,6 +667,14 @@
timeout: Duration,
}

#[cfg(any(
feature = "dangerous-h2c",
feature = "openssl",
feature = "rustls-0_20",
feature = "rustls-0_21",
feature = "rustls-0_22-webpki-roots",
feature = "rustls-0_22-native-roots",
))]
impl<Tcp, Tls, IO> Service<Connect> for TlsConnectorService<Tcp, Tls>
where
Tcp:
Expand Down