Skip to content

Commit fa6ba1a

Browse files
committed
build: Remove unneeded "default" feature attrs
This makes it more clear which features are actually needed for a section of code.
1 parent c01956e commit fa6ba1a

File tree

2 files changed

+8
-32
lines changed

2 files changed

+8
-32
lines changed

src/lib.rs

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,14 @@ extern crate log;
2525
#[cfg(feature = "use-openssl")]
2626
extern crate openssl;
2727
#[cfg(all(
28-
any(
29-
feature = "default",
30-
feature = "use-rustls",
31-
feature = "use-rustls-ring"
32-
),
28+
any(feature = "use-rustls", feature = "use-rustls-ring"),
3329
not(feature = "use-openssl")
3430
))]
3531
extern crate rustls;
3632
extern crate serde;
3733
extern crate serde_json;
3834

39-
#[cfg(any(
40-
feature = "default",
41-
feature = "use-rustls",
42-
feature = "use-rustls-ring"
43-
))]
35+
#[cfg(any(feature = "use-rustls", feature = "use-rustls-ring"))]
4436
extern crate webpki_roots;
4537

4638
#[cfg(feature = "proxy")]

src/raw_client.rs

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,7 @@ use bitcoin::{Script, Txid};
2323
use openssl::ssl::{SslConnector, SslMethod, SslStream, SslVerifyMode};
2424

2525
#[cfg(all(
26-
any(
27-
feature = "default",
28-
feature = "use-rustls",
29-
feature = "use-rustls-ring"
30-
),
26+
any(feature = "use-rustls", feature = "use-rustls-ring"),
3127
not(feature = "use-openssl")
3228
))]
3329
use rustls::{
@@ -36,7 +32,7 @@ use rustls::{
3632
ClientConfig, ClientConnection, RootCertStore, StreamOwned,
3733
};
3834

39-
#[cfg(any(feature = "default", feature = "proxy"))]
35+
#[cfg(feature = "proxy")]
4036
use crate::socks::{Socks5Stream, TargetAddr, ToTargetAddr};
4137

4238
use crate::stream::ClonableStream;
@@ -93,7 +89,7 @@ impl ToSocketAddrsDomain for (&str, u16) {
9389
}
9490
}
9591

96-
#[cfg(any(feature = "default", feature = "proxy"))]
92+
#[cfg(feature = "proxy")]
9793
impl ToSocketAddrsDomain for TargetAddr {
9894
fn domain(&self) -> Option<&str> {
9995
match self {
@@ -290,11 +286,7 @@ impl RawClient<ElectrumSslStream> {
290286
}
291287

292288
#[cfg(all(
293-
any(
294-
feature = "default",
295-
feature = "use-rustls",
296-
feature = "use-rustls-ring"
297-
),
289+
any(feature = "use-rustls", feature = "use-rustls-ring"),
298290
not(feature = "use-openssl")
299291
))]
300292
mod danger {
@@ -350,21 +342,13 @@ mod danger {
350342
}
351343

352344
#[cfg(all(
353-
any(
354-
feature = "default",
355-
feature = "use-rustls",
356-
feature = "use-rustls-ring"
357-
),
345+
any(feature = "use-rustls", feature = "use-rustls-ring"),
358346
not(feature = "use-openssl")
359347
))]
360348
/// Transport type used to establish a Rustls TLS encrypted/authenticated connection with the server
361349
pub type ElectrumSslStream = StreamOwned<ClientConnection, TcpStream>;
362350
#[cfg(all(
363-
any(
364-
feature = "default",
365-
feature = "use-rustls",
366-
feature = "use-rustls-ring"
367-
),
351+
any(feature = "use-rustls", feature = "use-rustls-ring"),
368352
not(feature = "use-openssl")
369353
))]
370354
impl RawClient<ElectrumSslStream> {

0 commit comments

Comments
 (0)