min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make clippy happy

This commit is contained in:
Ivan Nikulin 2020-12-03 14:12:46 +00:00
parent 2fc44386af
commit 42322f8b1e
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hyper-boring/src/lib.rs
View File

@ -84,8 +84,6 @@ impl HttpsLayer {
/// ALPN is configured to support both HTTP/1 and HTTP/1.1. /// ALPN is configured to support both HTTP/1 and HTTP/1.1.
pub fn new() -> Result<HttpsLayer, ErrorStack> { pub fn new() -> Result<HttpsLayer, ErrorStack> {
let mut ssl = SslConnector::builder(SslMethod::tls())?; let mut ssl = SslConnector::builder(SslMethod::tls())?;
// avoid unused_mut warnings when building against OpenSSL 1.0.1
ssl = ssl;
ssl.set_alpn_protos(b"\x02h2\x08http/1.1")?; ssl.set_alpn_protos(b"\x02h2\x08http/1.1")?;
@ -230,7 +228,7 @@ where
None => return Ok(MaybeHttpsStream::Http(conn)), None => return Ok(MaybeHttpsStream::Http(conn)),
}; };
let host = uri.host().ok_or_else(|| "URI missing host")?; let host = uri.host().ok_or("URI missing host")?;
let config = inner.setup_ssl(&uri, host)?; let config = inner.setup_ssl(&uri, host)?;
let stream = tokio_boring::connect(config, host, conn).await?; let stream = tokio_boring::connect(config, host, conn).await?;
@ -340,8 +338,6 @@ where
MaybeHttpsStream::Http(s) => s.connected(), MaybeHttpsStream::Http(s) => s.connected(),
MaybeHttpsStream::Https(s) => { MaybeHttpsStream::Https(s) => {
let mut connected = s.get_ref().connected(); let mut connected = s.get_ref().connected();
// Avoid unused_mut warnings on OpenSSL 1.0.1
connected = connected;
if s.ssl().selected_alpn_protocol() == Some(b"h2") { if s.ssl().selected_alpn_protocol() == Some(b"h2") {
connected = connected.negotiated_h2(); connected = connected.negotiated_h2();