forked/reqwest-impersonate
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Lint: fix unused Identity if only using default-tls (#1164)

Browse Source
This commit is contained in:
Sean McArthur
2021-02-08 14:25:09 -08:00
committed by GitHub
parent e56bd160ba
commit 287a6d1852
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/async_impl/client.rs
View File

@@ -44,7 +44,9 @@ use crate::redirect::{self, remove_sensitive_headers};
#[cfg(feature = "__tls")] #[cfg(feature = "__tls")]
use crate::tls::TlsBackend; use crate::tls::TlsBackend;
#[cfg(feature = "__tls")] #[cfg(feature = "__tls")]
use crate::{Certificate, Identity}; use crate::Certificate;
#[cfg(any(feature = "native-tls", feature = "__rustls"))]
use crate::Identity;
use crate::{IntoUrl, Method, Proxy, StatusCode, Url}; use crate::{IntoUrl, Method, Proxy, StatusCode, Url};
/// An asynchronous `Client` to make Requests with. /// An asynchronous `Client` to make Requests with.
@@ -84,7 +86,7 @@ struct Config {
pool_idle_timeout: Option<Duration>, pool_idle_timeout: Option<Duration>,
pool_max_idle_per_host: usize, pool_max_idle_per_host: usize,
tcp_keepalive: Option<Duration>, tcp_keepalive: Option<Duration>,
#[cfg(feature = "__tls")] #[cfg(any(feature = "native-tls", feature = "__rustls"))]
identity: Option<Identity>, identity: Option<Identity>,
proxies: Vec<Proxy>, proxies: Vec<Proxy>,
auto_sys_proxy: bool, auto_sys_proxy: bool,
@@ -149,7 +151,7 @@ impl ClientBuilder {
root_certs: Vec::new(), root_certs: Vec::new(),
#[cfg(feature = "__tls")] #[cfg(feature = "__tls")]
tls_built_in_root_certs: true, tls_built_in_root_certs: true,
#[cfg(feature = "__tls")] #[cfg(any(feature = "native-tls", feature = "__rustls"))]
identity: None, identity: None,
#[cfg(feature = "__tls")] #[cfg(feature = "__tls")]
tls: TlsBackend::default(), tls: TlsBackend::default(),
@@ -755,7 +757,7 @@ impl ClientBuilder {
/// ///
/// This requires the optional `native-tls` or `rustls-tls(-...)` feature to be /// This requires the optional `native-tls` or `rustls-tls(-...)` feature to be
/// enabled. /// enabled.
#[cfg(feature = "__tls")] #[cfg(any(feature = "native-tls", feature = "__rustls"))]
pub fn identity(mut self, identity: Identity) -> ClientBuilder { pub fn identity(mut self, identity: Identity) -> ClientBuilder {
self.config.identity = Some(identity); self.config.identity = Some(identity);
self self

11
src/blocking/client.rs
View File

@@ -20,7 +20,9 @@ use super::response::Response;
use super::wait; use super::wait;
use crate::{async_impl, header, IntoUrl, Method, Proxy, redirect}; use crate::{async_impl, header, IntoUrl, Method, Proxy, redirect};
#[cfg(feature = "__tls")] #[cfg(feature = "__tls")]
use crate::{Certificate, Identity}; use crate::Certificate;
#[cfg(any(feature = "native-tls", feature = "__rustls"))]
use crate::Identity;
/// A `Client` to make Requests with. /// A `Client` to make Requests with.
/// ///
@@ -461,7 +463,12 @@ impl ClientBuilder {
} }
/// Sets the identity to be used for client certificate authentication. /// Sets the identity to be used for client certificate authentication.
#[cfg(feature = "__tls")] ///
/// # Optional
///
/// This requires the optional `native-tls` or `rustls-tls(-...)` feature to be
/// enabled.
#[cfg(any(feature = "native-tls", feature = "__rustls"))]
pub fn identity(self, identity: Identity) -> ClientBuilder { pub fn identity(self, identity: Identity) -> ClientBuilder {
self.with_inner(move |inner| inner.identity(identity)) self.with_inner(move |inner| inner.identity(identity))
} }