download: Remove cURL backend

Cargo.toml

@@ -13,9 +13,6 @@ repository = "https://github.com/rust-lang/rustup.rs"
 description = "Manage multiple rust installations with ease"
 
 [features]
-default = ["curl-backend", "reqwest-backend"]
-curl-backend = ["download/curl-backend"]
-reqwest-backend = ["download/reqwest-backend"]
 vendored-openssl = ['openssl/vendored']
 # Include in the default set to disable self-update and uninstall.
 no-self-update = []
@@ -32,8 +29,7 @@ home = "0.5"
 lazy_static = "1"
 libc = "0.2"
 opener = "0.4.0"
-# Used by `curl` or `reqwest` backend although it isn't imported
-# by our rustup.
+# Used by `reqwest` although it isn't imported by our rustup.
 openssl = { version = "0.10", optional = true }
 pulldown-cmark = { version = "0.6", default-features = false }
 rand = "0.7"

README.md

@@ -559,25 +559,6 @@ On Windows, the command would be:
 set https_proxy=socks5://proxy.example.com:1080
 ```
 
-If you need a more complex setup, rustup supports the convention used by
-the __curl__ program, documented in the ENVIRONMENT section of
-[its manual page][curlman].
-
-The use of `curl` is presently **deprecated**, however it can still be used by
-providing the `RUSTUP_USE_CURL` environment variable, for example:
-
-```bash
-RUSTUP_USE_CURL=1 rustup update
-```
-
-Note that some versions of `libcurl` apparently require you to drop the
-`http://` or `https://` prefix in environment variables. For example,
-`export http_proxy=proxy.example.com:1080` (and likewise for HTTPS).
-If you are getting an SSL `unknown protocol` error from `rustup` via `libcurl`
-but the command-line `curl` command works fine, this may be the problem.
-
-[curlman]: https://curl.haxx.se/docs/manpage.html
-
 
 ## Examples
 

ci/build-run-docker.bash

@@ -56,7 +56,7 @@ docker run \
 
 # check that rustup-init was built with ssl support
 # see https://github.com/rust-lang/rustup.rs/issues/1051
-if ! (nm target/"${TARGET}"/release/rustup-init | grep -q Curl_ssl_version); then
+if ! (nm target/"${TARGET}"/release/rustup-init | grep -q openssl_sys); then
   echo "Missing ssl support!!!!" >&2
   exit 1
 fi

download/Cargo.toml

@@ -7,20 +7,12 @@ authors = [ "Brian Anderson <[email protected]>" ]
 
 license = "MIT/Apache-2.0"
 
-[features]
-
-default = ["reqwest-backend"]
-
-curl-backend = ["curl"]
-reqwest-backend = ["reqwest", "env_proxy", "lazy_static"]
-
 [dependencies]
+lazy_static = "1.0"
+env_proxy = "0.3.1"
 error-chain = "0.12"
+reqwest = { version = "0.9.14", features = ["socks"] }
 url = "1.7"
-curl = { version = "0.4.11", optional = true }
-env_proxy = { version = "0.3.1", optional = true }
-lazy_static = { version = "1.0", optional = true }
-reqwest = { version = "0.9.14", features = ["socks"], optional = true }
 
 [dev-dependencies]
 futures = "0.1"

download/src/errors.rs

@@ -5,7 +5,7 @@ error_chain! {
 
     foreign_links {
         Io(std::io::Error);
-        Reqwest(::reqwest::Error) #[cfg(feature = "reqwest-backend")];
+        Reqwest(::reqwest::Error);
     }
 
     errors {
@@ -16,9 +16,5 @@ error_chain! {
         FileNotFound {
             description("file not found")
         }
-        BackendUnavailable(be: &'static str) {
-            description("download backend unavailable")
-            display("download backend '{}' unavailable", be)
-        }
     }
 }