Remove the with_tls feature and make it default

Author: l1a

Cargo.toml

@@ -69,9 +69,7 @@ datetime = { version = "0.5.2", default-features = false }
 pretty_assertions = "1.4"
 
 [features]
-default = ["with_idna", "with_https", "with_rustls"]
+default = ["with_idna", "with_https"]
 with_idna = ["dns/with_idna"]
 
 with_https = ["dns-transport/with_https"]
-
-with_rustls = ["dns-transport/with_rustls"]

README.md

@@ -135,10 +135,10 @@ For more information, read [the xtests README](xtests/README.md).
 
 ### Feature toggles
 
-dog has three Cargo features that can be switched off to remove functionality.
+dog has two Cargo features that can be switched off to remove functionality.
 While doing so makes dog less useful, it results in a smaller binary that takes less time to build.
 
-There are three feature toggles available, all of which are active by default:
+There are two feature toggles available, both of which are active by default:
 
 - `with_idna`, which enables [IDNA](https://en.wikipedia.org/wiki/Internationalized_domain_name) processing
 - `with_https`, which enables DNS-over-HTTPS (requires built-in TLS support)

dns-transport/Cargo.toml

@@ -22,15 +22,13 @@ log = "0.4"
 # http response parsing
 httparse = { version = "1.10", optional = true }
 
-rustls = { version = "0.23", optional = true }
+rustls = "0.23"
 
-webpki = { version = "0.22.4", optional = true }
+webpki = "0.22.4"
 
-webpki-roots = { version = "1.0.2", optional = true }
+webpki-roots = "1.0.2"
 
 [features]
 default = []  # these are enabled in the main dog crate
 
 with_https = ["httparse"]
-
-with_rustls = ["rustls", "webpki-roots", "webpki"]

dns-transport/src/error.rs

@@ -14,15 +14,12 @@ pub enum Error {
     TruncatedResponse,
 
     /// An error from the TLS library.
-    #[cfg(feature = "with_rustls")]
     RustlsError(rustls::Error),
 
     /// Provided dns name is not valid
-    #[cfg(feature = "with_rustls")]
     RustlsInvalidDnsNameError(webpki::InvalidDnsNameError),
 
     /// Provided dns name is not valid
-    #[cfg(feature = "with_rustls")]
     RustlsInvalidDnsNameError2(rustls::pki_types::InvalidDnsNameError),
 
     /// There was a problem decoding the response HTTP headers or body.
@@ -50,21 +47,18 @@ impl From<std::io::Error> for Error {
     }
 }
 
-#[cfg(feature = "with_rustls")]
 impl From<rustls::Error> for Error {
     fn from(inner: rustls::Error) -> Self {
         Self::RustlsError(inner)
     }
 }
 
-#[cfg(feature = "with_rustls")]
 impl From<webpki::InvalidDnsNameError> for Error {
     fn from(inner: webpki::InvalidDnsNameError) -> Self {
         Self::RustlsInvalidDnsNameError(inner)
     }
 }
 
-#[cfg(feature = "with_rustls")]
 impl From<rustls::pki_types::InvalidDnsNameError> for Error {
     fn from(inner: rustls::pki_types::InvalidDnsNameError) -> Self {
         Self::RustlsInvalidDnsNameError2(inner)

src/main.rs

@@ -53,7 +53,6 @@ fn main() {
     match Options::getopts(env::args_os().skip(1)) {
         OptionsResult::Ok(options) => {
             info!("Running with options -> {:#?}", options);
-            disabled_feature_check(&options);
             exit(run(options));
         }
 
@@ -174,27 +173,6 @@ fn run(Options { requests, format, measure_time }: Options) -> i32 {
 }
 
 
-/// Checks whether the options contain parameters that will cause dog to fail
-/// because the feature is disabled by exiting if so.
-#[allow(unused)]
-fn disabled_feature_check(options: &Options) {
-    use std::process::exit;
-    use crate::connect::TransportType;
-
-    #[cfg(not(feature = "with_rustls"))]
-    if options.requests.inputs.transport_types.contains(&TransportType::TLS) {
-        eprintln!("dog: Cannot use '--tls': This version of dog has been compiled without TLS support");
-        exit(exits::OPTIONS_ERROR);
-    }
-
-    #[cfg(all(not(feature = "with_https"), not(feature = "with_rustls")))]
-    if options.requests.inputs.transport_types.contains(&TransportType::HTTPS) {
-        eprintln!("dog: Cannot use '--https': This version of dog has been compiled without HTTPS support");
-        exit(exits::OPTIONS_ERROR);
-    }
-}
-
-
 /// The possible status numbers dog can exit with.
 mod exits {
 

src/output.rs

@@ -648,7 +648,6 @@ fn erroneous_phase(error: &TransportError) -> &'static str {
         TransportError::WireError(_)          => "protocol",
         TransportError::TruncatedResponse     |
         TransportError::NetworkError(_)       => "network",
-        #[cfg(feature = "with_rustls")]
         TransportError::RustlsInvalidDnsNameError(_) |
         TransportError::RustlsError(_) |
         TransportError::RustlsInvalidDnsNameError2(_) => "tls", // TODO: Actually wrong, could be https
@@ -664,11 +663,8 @@ fn error_message(error: TransportError) -> String {
         TransportError::WireError(e)          => wire_error_message(e),
         TransportError::TruncatedResponse     => "Truncated response".into(),
         TransportError::NetworkError(e)       => e.to_string(),
-        #[cfg(any(feature = "with_rustls"))]
         TransportError::RustlsInvalidDnsNameError(e) => e.to_string(),
-        #[cfg(any(feature = "with_rustls"))]
         TransportError::RustlsError(e) => e.to_string(),
-        #[cfg(any(feature = "with_rustls"))]
         TransportError::RustlsInvalidDnsNameError2(e) => e.to_string(),
         #[cfg(feature = "with_https")]
         TransportError::HttpError(e)          => e.to_string(),