Skip to content

bitreq: Fix async feature gate #563

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

Open
jamillambert wants to merge 1 commit into
base: master
Choose a base branch
from
+22 −7
Open

bitreq: Fix async feature gate #563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion bitreq/src/connection.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ impl Write for HttpStream {
}
}

#[cfg(feature = "tokio-rustls")]
#[cfg(all(feature = "async", feature = "tokio-rustls"))]
type AsyncSecuredStream = rustls_stream::AsyncSecuredStream;

#[cfg(feature = "async")]
Expand Down
27 changes: 21 additions & 6 deletions bitreq/src/connection/rustls_stream.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,14 @@ use tokio_rustls::{client::TlsStream, TlsConnector};
#[cfg(feature = "rustls-webpki")]
use webpki_roots::TLS_SERVER_ROOTS;

#[cfg(feature = "tokio-rustls")]
#[cfg(all(feature = "async", feature = "tokio-rustls"))]
use super::{AsyncHttpStream, AsyncTcpStream};
#[cfg(all(feature = "native-tls", not(feature = "rustls"), feature = "tokio-native-tls"))]
#[cfg(all(
feature = "async",
feature = "native-tls",
not(feature = "rustls"),
feature = "tokio-native-tls"
))]
use super::{AsyncHttpStream, AsyncTcpStream};
use crate::Error;

Expand Down Expand Up @@ -66,10 +71,10 @@ pub(super) fn wrap_stream(tcp: TcpStream, host: &str) -> Result<SecuredStream, E

// Async rustls TLS implementation

#[cfg(all(feature = "rustls", feature = "tokio-rustls"))]
#[cfg(all(feature = "async", feature = "rustls", feature = "tokio-rustls"))]
pub type AsyncSecuredStream = TlsStream<tokio::net::TcpStream>;

#[cfg(all(feature = "rustls", feature = "tokio-rustls"))]
#[cfg(all(feature = "async", feature = "rustls", feature = "tokio-rustls"))]
pub(super) async fn wrap_async_stream(
tcp: AsyncTcpStream,
host: &str,
Expand Down Expand Up @@ -127,10 +132,20 @@ pub(super) fn wrap_stream(tcp: TcpStream, host: &str) -> Result<SecuredStream, E
connector.connect(host, tcp).map_err(native_tls_err)
}

#[cfg(all(feature = "native-tls", not(feature = "rustls"), feature = "tokio-native-tls"))]
#[cfg(all(
feature = "async",
feature = "native-tls",
not(feature = "rustls"),
feature = "tokio-native-tls"
))]
pub type AsyncSecuredStream = tokio_native_tls::TlsStream<tokio::net::TcpStream>;

#[cfg(all(feature = "native-tls", not(feature = "rustls"), feature = "tokio-native-tls"))]
#[cfg(all(
feature = "async",
feature = "native-tls",
not(feature = "rustls"),
feature = "tokio-native-tls"
))]
pub(super) async fn wrap_async_stream(
tcp: AsyncTcpStream,
host: &str,
Expand Down
Loading