Merge pull request #2035 from ecumene/fix-casual-errors

Cleaned up error messages
rust-lang · Oct 6, 2019 · 97bb7b9 · 97bb7b9
2 parents 856da77 + 7b53743
commit 97bb7b9
Showing 1 changed file with 21 additions and 23 deletions.
diff --git a/src/cli/common.rs b/src/cli/common.rs
@@ -517,37 +517,35 @@ pub fn dump_testament() {
     }
 }
 
-pub fn report_error(e: &Error) {
-    err!("{}", e);
+fn show_backtrace() -> bool {
+    if let Ok(true) = env::var("RUSTUP_NO_BACKTRACE").map(|s| s == "1") {
+        return false;
+    }
 
-    for e in e.iter().skip(1) {
-        info!("caused by: {}", e);
+    if let Ok(true) = env::var("RUST_BACKTRACE").map(|s| s == "1") {
+        return true;
     }
 
-    if show_backtrace() {
-        if let Some(backtrace) = e.backtrace() {
-            info!("backtrace:");
-            println!();
-            println!("{:?}", backtrace);
+    for arg in env::args() {
+        if arg == "-v" || arg == "--verbose" {
+            return true;
         }
-    } else {
     }
 
-    fn show_backtrace() -> bool {
-        if let Ok(true) = env::var("RUSTUP_NO_BACKTRACE").map(|s| s == "1") {
-            return false;
-        }
+    false
+}
 
-        if let Ok(true) = env::var("RUST_BACKTRACE").map(|s| s == "1") {
-            return true;
-        }
+pub fn report_error(e: &Error) {
+    err!("{}", e);
 
-        for arg in env::args() {
-            if arg == "-v" || arg == "--verbose" {
-                return true;
-            }
-        }
+    for e in e.iter().skip(1) {
+        err!("caused by: {}", e);
+    }
 
-        false
+    if show_backtrace() {
+        if let Some(backtrace) = e.backtrace() {
+            err!("backtrace:");
+            err!("{:?}", backtrace);
+        }
     }
 }