Default to native-tls for now

Defaulting to native-tls so that users can try out the rustls mode before it's turned on by default.
rust-lang · Nov 18, 2020 · f5f95d8 · f5f95d8
1 parent 5b268a0
commit f5f95d8
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/utils/utils.rs b/src/utils/utils.rs
@@ -243,20 +243,20 @@ fn download_file_(
 
     // Keep the curl env var around for a bit
     let use_curl_backend = process().var_os("RUSTUP_USE_CURL").is_some();
-    let avoid_rustls = process().var_os("RUSTUP_AVOID_RUSTLS").is_some();
+    let use_rustls = process().var_os("RUSTUP_USE_RUSTLS").is_some();
     let (backend, notification) = if use_curl_backend {
         (Backend::Curl, Notification::UsingCurl)
     } else {
-        let tls_backend = if avoid_rustls {
-            TlsBackend::Default
+        let tls_backend = if use_rustls {
+            TlsBackend::Rustls
         } else {
-            #[cfg(feature = "reqwest-rustls-tls")]
+            #[cfg(feature = "reqwest-default-tls")]
             {
-                TlsBackend::Rustls
+                TlsBackend::Default
             }
-            #[cfg(not(feature = "reqwest-rustls-tls"))]
+            #[cfg(not(feature = "reqwest-default-tls"))]
             {
-                TlsBackend::Default
+                TlsBackend::Rustls
             }
         };
         (Backend::Reqwest(tls_backend), Notification::UsingReqwest)