Deprecate cURL

Author: Trevor Miranda

src/download/Cargo.toml

@@ -9,7 +9,7 @@ license = "MIT/Apache-2.0"
 
 [features]
 
-default = ["curl-backend"]
+default = ["reqwest-backend"]
 
 curl-backend = ["curl"]
 reqwest-backend = ["reqwest", "env_proxy", "lazy_static"]

src/rustup-utils/src/notifications.rs

@@ -20,8 +20,8 @@ pub enum Notification<'a> {
     DownloadFinished,
     NoCanonicalPath(&'a Path),
     ResumingPartialDownload,
-    UsingCurl,
     UsingReqwest,
+    UsingCurl,
     UsingHyperDeprecated,
 }
 
@@ -64,10 +64,9 @@ impl<'a> Display for Notification<'a> {
             ResumingPartialDownload => write!(f, "resuming partial download"),
             UsingCurl => write!(f, "downloading with curl"),
             UsingReqwest => write!(f, "downloading with reqwest"),
-            UsingHyperDeprecated => f.write_str(
-                "RUSTUP_USE_HYPER environment variable is deprecated,\
-                 use RUSTUP_USE_REQWEST instead",
-            ),
+            UsingHyperDeprecated => {
+                f.write_str("RUSTUP_USE_HYPER environment variable is deprecated.")
+            }
         }
     }
 }

src/rustup-utils/src/utils.rs

@@ -210,11 +210,11 @@ fn download_file_(
     if use_hyper_backend && DEPRECATED_HYPER_WARNED.swap(true, Ordering::Relaxed) {
         notify_handler(Notification::UsingHyperDeprecated);
     }
-    let use_reqwest_backend = use_hyper_backend || env::var_os("RUSTUP_USE_REQWEST").is_some();
-    let (backend, notification) = if use_reqwest_backend {
-        (Backend::Reqwest, Notification::UsingReqwest)
-    } else {
+    let use_curl_backend = env::var_os("RUSTUP_USE_CURL").is_some();
+    let (backend, notification) = if use_curl_backend {
         (Backend::Curl, Notification::UsingCurl)
+    } else {
+        (Backend::Reqwest, Notification::UsingReqwest)
     };
     notify_handler(notification);
     download_to_path_with_backend(backend, url, path, resume_from_partial, Some(callback))?;