download: remove intermediate reqwest-backend feature

Author: djc

Cargo.toml

@@ -12,14 +12,8 @@ build = "build.rs"
 
 [features]
 curl-backend = ["download/curl-backend"]
-default = [
-  "curl-backend",
-  "reqwest-backend",
-  "reqwest-native-tls",
-  "reqwest-rustls-tls",
-]
+default = ["curl-backend", "reqwest-native-tls", "reqwest-rustls-tls"]
 
-reqwest-backend = ["download/reqwest-backend"]
 vendored-openssl = ['openssl/vendored']
 
 reqwest-native-tls = ["download/reqwest-native-tls"]
@@ -183,4 +177,4 @@ opt-level = 0
 
 [package.metadata.cargo-all-features]
 # Building with no web backend will error.
-always_include_features = ["reqwest-backend", "reqwest-rustls-tls"]
+always_include_features = ["reqwest-rustls-tls"]

ci/run.bash

@@ -8,7 +8,7 @@ rustc -vV
 cargo -vV
 
 
-FEATURES=('--no-default-features' '--features' 'curl-backend,reqwest-backend,reqwest-native-tls')
+FEATURES=('--no-default-features' '--features' 'curl-backend,reqwest-native-tls')
 case "$(uname -s)" in
   *NT* ) ;; # Windows NT
   * ) FEATURES+=('--features' 'vendored-openssl') ;;
@@ -38,7 +38,7 @@ target_cargo() {
 target_cargo build
 
 download_pkg_test() {
-  features=('--no-default-features' '--features' 'curl-backend,reqwest-backend,reqwest-native-tls')
+  features=('--no-default-features' '--features' 'curl-backend,reqwest-native-tls')
   case "$TARGET" in
     # these platforms aren't supported by ring:
     powerpc* ) ;;

download/Cargo.toml

@@ -5,12 +5,13 @@ edition.workspace = true
 license.workspace = true
 
 [features]
-default = ["reqwest-backend", "reqwest-rustls-tls", "reqwest-native-tls"]
+default = ["reqwest-rustls-tls", "reqwest-native-tls"]
 curl-backend = ["curl"]
-reqwest-backend = ["reqwest", "env_proxy"]
-reqwest-native-tls = ["reqwest/native-tls"]
+reqwest-native-tls = ["reqwest/native-tls", "dep:reqwest", "dep:env_proxy"]
 reqwest-rustls-tls = [
   "reqwest/rustls-tls-manual-roots-no-provider",
+  "dep:env_proxy",
+  "dep:reqwest",
   "dep:rustls",
   "dep:rustls-platform-verifier",
 ]

download/src/lib.rs

@@ -167,7 +167,11 @@ pub async fn download_to_path_with_backend_(
     Ok::<(), anyhow::Error>(())
 }
 
-#[cfg(all(not(feature = "reqwest-backend"), not(feature = "curl-backend")))]
+#[cfg(all(
+    not(feature = "reqwest-rustls-tls"),
+    not(feature = "reqwest-native-tls"),
+    not(feature = "curl-backend")
+))]
 compile_error!("Must enable at least one backend");
 
 /// Download via libcurl; encrypt with the native (or OpenSSl) TLS
@@ -284,7 +288,7 @@ pub mod curl {
     }
 }
 
-#[cfg(feature = "reqwest-backend")]
+#[cfg(any(feature = "reqwest-rustls-tls", feature = "reqwest-native-tls"))]
 pub mod reqwest_be {
     #[cfg(all(
         not(feature = "reqwest-rustls-tls"),
@@ -480,7 +484,7 @@ pub enum DownloadError {
     Message(String),
     #[error(transparent)]
     IoError(#[from] std::io::Error),
-    #[cfg(feature = "reqwest-backend")]
+    #[cfg(any(feature = "reqwest-rustls-tls", feature = "reqwest-native-tls"))]
     #[error(transparent)]
     Reqwest(#[from] ::reqwest::Error),
     #[cfg(feature = "curl-backend")]
@@ -504,7 +508,10 @@ pub mod curl {
     }
 }
 
-#[cfg(not(feature = "reqwest-backend"))]
+#[cfg(all(
+    not(feature = "reqwest-rustls-tls"),
+    not(feature = "reqwest-native-tls")
+))]
 pub mod reqwest_be {
     use anyhow::{anyhow, Result};
     use url::Url;

download/tests/download-reqwest-resume.rs

@@ -1,4 +1,4 @@
-#![cfg(feature = "reqwest-backend")]
+#![cfg(any(feature = "reqwest-rustls-tls", feature = "reqwest-native-tls"))]
 
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Mutex;

download/tests/read-proxy-env.rs

@@ -1,4 +1,4 @@
-#![cfg(feature = "reqwest-backend")]
+#![cfg(any(feature = "reqwest-rustls-tls", feature = "reqwest-native-tls"))]
 
 use std::env::{remove_var, set_var};
 use std::error::Error;