From 9495c5aa1e95ba3862648b389f7d482a6ea3ecdc Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Thu, 21 Jul 2016 23:05:31 +0000
Subject: [PATCH] Update to error-chain 0.2.2

---
 Cargo.lock                     | 10 +++++-----
 src/download/src/errors.rs     |  4 ----
 src/rustup-cli/errors.rs       |  4 ----
 src/rustup-dist/src/errors.rs  |  4 ----
 src/rustup-utils/src/errors.rs |  4 ----
 src/rustup/errors.rs           |  4 ----
 6 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3e94b68909..26122280d4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,7 +4,7 @@ version = "0.3.0"
 dependencies = [
  "clap 2.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "download 0.3.0",
- "error-chain 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "error-chain 0.2.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.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "error-chain 0.2.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.2.1"
+version = "0.2.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.3.0"
 dependencies = [
- "error-chain 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "error-chain 0.2.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.3.0"
 dependencies = [
  "advapi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "download 0.3.0",
- "error-chain 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "error-chain 0.2.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/src/download/src/errors.rs b/src/download/src/errors.rs
index e531304ccf..45b5d0cc27 100644
--- a/src/download/src/errors.rs
+++ b/src/download/src/errors.rs
@@ -1,8 +1,4 @@
 error_chain! {
-    types {
-        Error, ErrorKind, ChainErr, Result;
-    }
-
     links { }
 
     foreign_links { }
diff --git a/src/rustup-cli/errors.rs b/src/rustup-cli/errors.rs
index 35e93b2d87..2d3a864d73 100644
--- a/src/rustup-cli/errors.rs
+++ b/src/rustup-cli/errors.rs
@@ -7,10 +7,6 @@ use rustup_dist::{self, temp};
 use rustup_utils;
 
 error_chain! {
-    types {
-        Error, ErrorKind, ChainErr, Result;
-    }
-
     links {
         rustup::Error, rustup::ErrorKind, Rustup;
         rustup_dist::Error, rustup_dist::ErrorKind, Dist;
diff --git a/src/rustup-dist/src/errors.rs b/src/rustup-dist/src/errors.rs
index 1a06cfb843..9ceb9b665f 100644
--- a/src/rustup-dist/src/errors.rs
+++ b/src/rustup-dist/src/errors.rs
@@ -6,10 +6,6 @@ use rustup_utils;
 use manifest::Component;
 
 error_chain! {
-    types {
-        Error, ErrorKind, ChainErr, Result;
-    }
-
     links {
         rustup_utils::Error, rustup_utils::ErrorKind, Utils;
     }
diff --git a/src/rustup-utils/src/errors.rs b/src/rustup-utils/src/errors.rs
index ad29831dcb..e756b5d3a2 100644
--- a/src/rustup-utils/src/errors.rs
+++ b/src/rustup-utils/src/errors.rs
@@ -4,10 +4,6 @@ use url::Url;
 use download;
 
 error_chain! {
-    types {
-        Error, ErrorKind, ChainErr, Result;
-    }
-
     links {
         download::Error, download::ErrorKind, Download;
     }
diff --git a/src/rustup/errors.rs b/src/rustup/errors.rs
index 9c526c0148..5b811ab234 100644
--- a/src/rustup/errors.rs
+++ b/src/rustup/errors.rs
@@ -4,10 +4,6 @@ use rustup_dist::manifest::Component;
 use toml;
 
 error_chain! {
-    types {
-        Error, ErrorKind, ChainErr, Result;
-    }
-
     links {
         rustup_dist::Error, rustup_dist::ErrorKind, Dist;
         rustup_utils::Error, rustup_utils::ErrorKind, Utils;