Update a slew of dependencies

Author: alexcrichton

Cargo.lock

@@ -35,35 +35,35 @@ msi-installed = []
 rustup-dist = { path = "src/rustup-dist" }
 rustup-utils = { path = "src/rustup-utils" }
 download = { path = "src/download" }
-error-chain = "0.7.1"
+error-chain = "0.10"
 clap = "2.18.0"
-regex = "0.1.41"
+regex = "0.2"
 url = "1.1.0"
 term = "0.4.4"
-itertools = "0.4.1"
+itertools = "0.6"
 time = "0.1.34"
 tempdir = "0.3.4"
 tempfile = "2.1.4"
 libc = "0.2.0"
 rand = "0.3.11"
-scopeguard = "0.1.2"
+markdown = "0.2"
 rustc-serialize = "0.3"
+scopeguard = "0.3"
 sha2 = "0.6.0"
-markdown = "0.2"
-toml = "0.1.27"
+toml = "0.1"
 wait-timeout = "0.1.5"
 
 [target."cfg(windows)".dependencies]
 winapi = "0.2.8"
-winreg = "0.3.2"
-user32-sys = "0.1.2"
+winreg = "0.4.0"
+user32-sys = "0.2.0"
 kernel32-sys = "0.2.1"
 gcc = "0.3.50"
 psapi-sys = "0.1"
 
 [dev-dependencies]
 rustup-mock = { path = "src/rustup-mock", version = "1.1.0" }
-lazy_static = "0.1.15"
+lazy_static = "0.2"
 
 [workspace]
 members = ["src/rustup-win-installer"]

Cargo.toml

@@ -15,7 +15,7 @@ fi
 docker run \
   --entrypoint bash \
   -u `id -u`:`id -g` \
-  -v $HOME/rust:/travis-rust:ro \
+  -v `rustc --print sysroot`:/travis-rust:ro \
   -v `pwd`:/buildslave:ro \
   -v `pwd`/target:/buildslave/target \
   -e TARGET=$TARGET \

ci/build-run-docker.sh

@@ -15,7 +15,7 @@ hyper-backend = ["hyper", "env_proxy", "native-tls", "openssl-probe"]
 rustls-backend = ["hyper", "env_proxy", "rustls", "lazy_static", "ca-loader"]
 
 [dependencies]
-error-chain = "0.7.1"
+error-chain = "0.10"
 url = "1.1"
 curl = { version = "0.4.6", optional = true }
 lazy_static = { version = "0.2", optional = true }
@@ -37,7 +37,7 @@ optional = true
 openssl-probe = { version = "0.1", optional = true }
 
 [dependencies.rustls]
-version = "0.1.2"
+version = "0.9"
 optional = true
 
 [dependencies.ca-loader]

src/download/Cargo.toml

@@ -207,7 +207,7 @@ fn canonical_cargo_home() -> Result<String> {
             path_str = String::from("$HOME/.cargo");
         } else {
             path_str = String::from(r"%USERPROFILE%\.cargo");
-        } 
+        }
     }
 
     Ok(path_str)
@@ -1337,7 +1337,7 @@ fn parse_new_rustup_version(version: String) -> String {
     let re = Regex::new(r"\d+.\d+.\d+[0-9a-zA-Z-]*").unwrap();
     let capture = re.captures(&version);
     let matched_version = match capture {
-        Some(cap) => cap.at(0).unwrap(),
+        Some(cap) => cap.get(0).unwrap().as_str(),
         None => "(unknown)"
     };
     String::from(matched_version)

src/rustup-cli/self_update.rs

@@ -13,27 +13,27 @@ repository = "https://github.com/rust-lang-nursery/rustup.rs"
 license = "MIT OR Apache-2.0"
 
 [dependencies]
-regex = "0.1.41"
-itertools = "0.4.1"
+regex = "0.2.0"
+itertools = "0.6"
 ole32-sys = "0.2.0"
 url = "1.1.0"
 tar = "0.4.0"
 flate2 = "0.2.9"
 xz2 = "0.1.3"
 tempdir = "0.3.4"
-walkdir = "0.1.5"
+walkdir = "1.0"
 toml = "0.1.27"
 sha2 = "0.6.0"
 rustup-utils = { path = "../rustup-utils" }
-error-chain = "0.7.1"
+error-chain = "0.10"
 
 [dev-dependencies]
 rustup-mock = { path = "../rustup-mock" }
 
 [target."cfg(windows)".dependencies]
 winapi = "0.2.8"
-winreg = "0.3.2"
-user32-sys = "0.1.2"
+winreg = "0.4"
+user32-sys = "0.2.0"
 kernel32-sys = "0.2.1"
 
 [target."cfg(not(windows))".dependencies]

src/rustup-dist/Cargo.toml

@@ -229,9 +229,9 @@ impl PartialTargetTriple {
             }
 
             PartialTargetTriple {
-                arch: c.at(1).and_then(fn_map),
-                os: c.at(2).and_then(fn_map),
-                env: c.at(3).and_then(fn_map),
+                arch: c.get(1).map(|s| s.as_str()).and_then(fn_map),
+                os: c.get(2).map(|s| s.as_str()).and_then(fn_map),
+                env: c.get(3).map(|s| s.as_str()).and_then(fn_map),
             }
         })
     }
@@ -256,12 +256,12 @@ impl PartialToolchainDesc {
                 }
             }
 
-            let trip = c.at(3).unwrap_or("");
+            let trip = c.get(3).map(|c| c.as_str()).unwrap_or("");
             let trip = PartialTargetTriple::from_str(&trip);
             trip.map(|t| {
                 PartialToolchainDesc {
-                    channel: c.at(1).unwrap().to_owned(),
-                    date: c.at(2).and_then(fn_map),
+                    channel: c.get(1).unwrap().as_str().to_owned(),
+                    date: c.get(2).map(|s| s.as_str()).and_then(fn_map),
                     target: t,
                 }
             })
@@ -331,9 +331,9 @@ impl ToolchainDesc {
                 }
 
                 ToolchainDesc {
-                    channel: c.at(1).unwrap().to_owned(),
-                    date: c.at(2).and_then(fn_map),
-                    target: TargetTriple(c.at(3).unwrap().to_owned()),
+                    channel: c.get(1).unwrap().as_str().to_owned(),
+                    date: c.get(2).map(|s| s.as_str()).and_then(fn_map),
+                    target: TargetTriple(c.get(3).unwrap().as_str().to_owned()),
                 }
             })
             .ok_or(ErrorKind::InvalidToolchainName(name.to_string()).into())

src/rustup-dist/src/dist.rs

@@ -11,13 +11,13 @@ repository = "https://github.com/rust-lang-nursery/rustup.rs"
 
 [dependencies]
 url = "1.1.0"
-scopeguard = "0.1.2"
-lazy_static = "0.1.15"
-walkdir = "0.1.5"
+scopeguard = "0.3.0"
+lazy_static = "0.2.0"
+walkdir = "1.0.0"
 flate2 = "0.2.9"
 xz2 = "0.1.3"
 tempdir = "0.3.4"
-itertools = "0.4.1"
+itertools = "0.6"
 tar = "0.4.0"
 toml = "0.1.27"
 rustup-utils = { path = "../rustup-utils" }
@@ -26,5 +26,5 @@ wait-timeout = "0.1.3"
 
 [target."cfg(windows)".dependencies]
 winapi = "0.2.8"
-winreg = "0.3.2"
+winreg = "0.4.0"
 

src/rustup-mock/Cargo.toml

@@ -12,24 +12,23 @@ repository = "https://github.com/rust-lang-nursery/rustup.rs"
 license = "MIT OR Apache-2.0"
 
 [dependencies]
-rand = "0.3.11"
-scopeguard = "0.1.2"
-error-chain = "0.7.1"
+download = { path = "../download" }
+error-chain = "0.10"
 libc = "0.2.0"
+rand = "0.3.11"
 rustc-serialize = "0.3.19"
+scopeguard = "0.3.0"
+semver = "0.7.0"
 sha2 = "0.6.0"
-url = "1.1"
 toml = "0.1.27"
-semver = "0.4.0"
-download = { path = "../download" }
-lazy_static = "0.1.15"
+url = "1.1"
 
 [target."cfg(windows)".dependencies]
-winapi = "0.2.8"
-winreg = "0.3.2"
-shell32-sys = "0.1.1"
-ole32-sys = "0.2.0"
-kernel32-sys = "0.2.1"
 advapi32-sys = "0.2.0"
+kernel32-sys = "0.2.1"
+lazy_static = "0.2"
+ole32-sys = "0.2.0"
+shell32-sys = "0.1.1"
 userenv-sys = "0.2.0"
-
+winapi = "0.2.8"
+winreg = "0.4.0"

src/rustup-utils/Cargo.toml

@@ -10,8 +10,6 @@ extern crate url;
 extern crate toml;
 extern crate download;
 extern crate semver;
-#[macro_use]
-extern crate lazy_static;
 
 #[cfg(windows)]
 extern crate winapi;
@@ -27,6 +25,9 @@ extern crate kernel32;
 extern crate advapi32;
 #[cfg(windows)]
 extern crate userenv;
+#[cfg(windows)]
+#[macro_use]
+extern crate lazy_static;
 
 #[cfg(unix)]
 extern crate libc;