From f2f1ed5fcd22417f70bb6fdb4183d1b8ad4bbd69 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Tue, 2 Aug 2016 12:07:57 -0700 Subject: [PATCH 1/2] Upgrade error-chain to 0.3 --- Cargo.lock | 10 +++++----- Cargo.toml | 2 +- src/download/Cargo.toml | 2 +- src/rustup-dist/Cargo.toml | 2 +- src/rustup-utils/Cargo.toml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 17b240a1bd..99bb3e53b0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,7 +4,7 @@ version = "0.5.0" dependencies = [ "clap 2.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "download 0.3.0", - "error-chain 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "error-chain 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.4.16 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", @@ -194,7 +194,7 @@ dependencies = [ "ca-loader 0.1.0", "curl 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "env_proxy 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "error-chain 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "error-chain 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "native-tls 0.1.0 (git+https://github.com/sfackler/rust-native-tls.git)", @@ -213,7 +213,7 @@ dependencies = [ [[package]] name = "error-chain" -version = "0.2.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "backtrace 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -565,7 +565,7 @@ dependencies = [ name = "rustup-dist" version = "0.5.0" dependencies = [ - "error-chain 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "error-chain 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "flate2 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "gcc 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.4.16 (registry+https://github.com/rust-lang/crates.io-index)", @@ -611,7 +611,7 @@ version = "0.5.0" dependencies = [ "advapi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "download 0.3.0", - "error-chain 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "error-chain 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "ole32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/Cargo.toml b/Cargo.toml index da7dda9151..313dd98a93 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,7 +32,7 @@ no-self-update = [] rustup-dist = { path = "src/rustup-dist", version = "0.5.0" } rustup-utils = { path = "src/rustup-utils", version = "0.5.0" } download = { path = "src/download" } -error-chain = "0.2.1" +error-chain = "0.3.0" clap = "2.2.4" regex = "0.1.41" url = "1.1.0" diff --git a/src/download/Cargo.toml b/src/download/Cargo.toml index 22a968c6b6..ce38049aba 100644 --- a/src/download/Cargo.toml +++ b/src/download/Cargo.toml @@ -15,7 +15,7 @@ hyper-backend = ["hyper", "env_proxy", "native-tls", "openssl-sys"] rustls-backend = ["hyper", "env_proxy", "rustls", "lazy_static", "ca-loader"] [dependencies] -error-chain = "0.2.1" +error-chain = "0.3.0" url = "1.1" curl = { version = "0.3", optional = true } lazy_static = { version = "0.2", optional = true } diff --git a/src/rustup-dist/Cargo.toml b/src/rustup-dist/Cargo.toml index 070a607354..53400786b2 100644 --- a/src/rustup-dist/Cargo.toml +++ b/src/rustup-dist/Cargo.toml @@ -24,7 +24,7 @@ walkdir = "0.1.5" toml = "0.1.27" sha2 = "0.1.2" rustup-utils = { path = "../rustup-utils", version = "0.5.0" } -error-chain = "0.2.1" +error-chain = "0.3.0" rustup-mock = { path = "../rustup-mock", version = "0.5.0" } [target."cfg(windows)".dependencies] diff --git a/src/rustup-utils/Cargo.toml b/src/rustup-utils/Cargo.toml index bd9fa13bd4..2ef5eb74a9 100644 --- a/src/rustup-utils/Cargo.toml +++ b/src/rustup-utils/Cargo.toml @@ -14,7 +14,7 @@ license = "MIT OR Apache-2.0" [dependencies] rand = "0.3.11" scopeguard = "0.1.2" -error-chain = "0.2.1" +error-chain = "0.3.0" libc = "0.2.0" rustc-serialize = "0.3.19" sha2 = "0.1.2" From 726f2064bd810bfed0832d2e55b76b0eb97561fd Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Fri, 5 Aug 2016 18:56:06 -0700 Subject: [PATCH 2/2] Update error-chain to 0.4 --- Cargo.lock | 10 +++++----- Cargo.toml | 3 +-- src/download/Cargo.toml | 2 +- src/rustup-cli/errors.rs | 3 +-- src/rustup-dist/Cargo.toml | 2 +- src/rustup-dist/src/errors.rs | 3 +-- src/rustup-utils/Cargo.toml | 2 +- src/rustup/errors.rs | 3 +-- 8 files changed, 12 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 99bb3e53b0..c34dd3ba18 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,7 +4,7 @@ version = "0.5.0" dependencies = [ "clap 2.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "download 0.3.0", - "error-chain 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "error-chain 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.4.16 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", @@ -194,7 +194,7 @@ dependencies = [ "ca-loader 0.1.0", "curl 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "env_proxy 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "error-chain 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "error-chain 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "native-tls 0.1.0 (git+https://github.com/sfackler/rust-native-tls.git)", @@ -213,7 +213,7 @@ dependencies = [ [[package]] name = "error-chain" -version = "0.3.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "backtrace 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -565,7 +565,7 @@ dependencies = [ name = "rustup-dist" version = "0.5.0" dependencies = [ - "error-chain 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "error-chain 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "flate2 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "gcc 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.4.16 (registry+https://github.com/rust-lang/crates.io-index)", @@ -611,7 +611,7 @@ version = "0.5.0" dependencies = [ "advapi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "download 0.3.0", - "error-chain 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "error-chain 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "ole32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/Cargo.toml b/Cargo.toml index 313dd98a93..d876bd09e2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,7 +32,7 @@ no-self-update = [] rustup-dist = { path = "src/rustup-dist", version = "0.5.0" } rustup-utils = { path = "src/rustup-utils", version = "0.5.0" } download = { path = "src/download" } -error-chain = "0.3.0" +error-chain = "0.4.0" clap = "2.2.4" regex = "0.1.41" url = "1.1.0" @@ -67,4 +67,3 @@ test = false # no unit tests name = "rustup-init" path = "src/rustup-cli/main.rs" test = false # no unit tests - diff --git a/src/download/Cargo.toml b/src/download/Cargo.toml index ce38049aba..4efa9e6ef0 100644 --- a/src/download/Cargo.toml +++ b/src/download/Cargo.toml @@ -15,7 +15,7 @@ hyper-backend = ["hyper", "env_proxy", "native-tls", "openssl-sys"] rustls-backend = ["hyper", "env_proxy", "rustls", "lazy_static", "ca-loader"] [dependencies] -error-chain = "0.3.0" +error-chain = "0.4.0" url = "1.1" curl = { version = "0.3", optional = true } lazy_static = { version = "0.2", optional = true } diff --git a/src/rustup-cli/errors.rs b/src/rustup-cli/errors.rs index 2d3a864d73..e7593ff4c3 100644 --- a/src/rustup-cli/errors.rs +++ b/src/rustup-cli/errors.rs @@ -14,8 +14,7 @@ error_chain! { } foreign_links { - temp::Error, Temp, - "temporary file error"; + temp::Error, Temp; } errors { diff --git a/src/rustup-dist/Cargo.toml b/src/rustup-dist/Cargo.toml index 53400786b2..2dfba29b1a 100644 --- a/src/rustup-dist/Cargo.toml +++ b/src/rustup-dist/Cargo.toml @@ -24,7 +24,7 @@ walkdir = "0.1.5" toml = "0.1.27" sha2 = "0.1.2" rustup-utils = { path = "../rustup-utils", version = "0.5.0" } -error-chain = "0.3.0" +error-chain = "0.4.0" rustup-mock = { path = "../rustup-mock", version = "0.5.0" } [target."cfg(windows)".dependencies] diff --git a/src/rustup-dist/src/errors.rs b/src/rustup-dist/src/errors.rs index 9ceb9b665f..7a1245b314 100644 --- a/src/rustup-dist/src/errors.rs +++ b/src/rustup-dist/src/errors.rs @@ -11,8 +11,7 @@ error_chain! { } foreign_links { - temp::Error, Temp, - "temporary file error"; + temp::Error, Temp; } errors { diff --git a/src/rustup-utils/Cargo.toml b/src/rustup-utils/Cargo.toml index 2ef5eb74a9..4d6b6e35ab 100644 --- a/src/rustup-utils/Cargo.toml +++ b/src/rustup-utils/Cargo.toml @@ -14,7 +14,7 @@ license = "MIT OR Apache-2.0" [dependencies] rand = "0.3.11" scopeguard = "0.1.2" -error-chain = "0.3.0" +error-chain = "0.4.0" libc = "0.2.0" rustc-serialize = "0.3.19" sha2 = "0.1.2" diff --git a/src/rustup/errors.rs b/src/rustup/errors.rs index 5b811ab234..fbeb295e46 100644 --- a/src/rustup/errors.rs +++ b/src/rustup/errors.rs @@ -10,8 +10,7 @@ error_chain! { } foreign_links { - temp::Error, Temp, - "temporary file error"; + temp::Error, Temp; } errors {