Merge pull request #703 from squidpickles/optional-backtrace

brson · web-flow · commit 1a4bbe996d09 · 2016-09-30T00:40:14.000Z
Update to error-chain 0.5.0 to allow optional backtrace. #591
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -35,7 +35,7 @@ msi-installed = []
 rustup-dist = { path = "src/rustup-dist", version = "0.6.3" }
 rustup-utils = { path = "src/rustup-utils", version = "0.6.3" }
 download = { path = "src/download" }
-error-chain = "0.4.0"
+error-chain = "0.5.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
@@ -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.4.0"
+error-chain = "0.5.0"
 url = "1.1"
 curl = { version = "0.3", optional = true }
 lazy_static = { version = "0.2", optional = true }
diff --git a/src/rustup-cli/common.rs b/src/rustup-cli/common.rs
@@ -353,9 +353,11 @@ pub fn report_error(e: &Error) {
     }
 
     if show_backtrace() {
-        info!("backtrace:");
-        println!("");
-        println!("{:?}", e.backtrace());
+        if let Some(backtrace) = e.backtrace() {
+            info!("backtrace:");
+            println!("");
+            println!("{:?}", backtrace);
+        }
     } else {
     }
 
diff --git 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.6.3" }
-error-chain = "0.4.0"
+error-chain = "0.5.0"
 rustup-mock = { path = "../rustup-mock", version = "0.6.3" }
 
 [target."cfg(windows)".dependencies]
diff --git 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.4.0"
+error-chain = "0.5.0"
 libc = "0.2.0"
 rustc-serialize = "0.3.19"
 sha2 = "0.1.2"

Original file line number	Diff line number	Diff line change
`@@ -353,9 +353,11 @@ pub fn report_error(e: &Error) {`
`353`	`353`	`}`
`354`	`354`
`355`	`355`	`if show_backtrace() {`
`356`		`- info!("backtrace:");`
`357`		`- println!("");`
`358`		`- println!("{:?}", e.backtrace());`
	`356`	`+ if let Some(backtrace) = e.backtrace() {`
	`357`	`+ info!("backtrace:");`
	`358`	`+ println!("");`
	`359`	`+ println!("{:?}", backtrace);`
	`360`	`+ }`
`359`	`361`	`} else {`
`360`	`362`	`}`
`361`	`363`