summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorJohannes Oertel <johannes.oertel@uni-due.de>2016-01-25 18:16:43 +0100
committerJohannes Oertel <johannes.oertel@uni-due.de>2016-01-26 10:37:12 +0100
commitc07413c204d055de881f304b8fccaa50ecd60956 (patch)
tree951616fdbcee580f6014e7737f7fc6ff29063084 /src/libstd
parentcd1b845492e13ae9e0da382dc0ec09d676d2dd59 (diff)
downloadrust-c07413c204d055de881f304b8fccaa50ecd60956.tar.gz
rust-c07413c204d055de881f304b8fccaa50ecd60956.zip
Add message about RUST_BACKTRACE to default output of panic!
The note will only be shown on the first panic.
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/panicking.rs5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/libstd/panicking.rs b/src/libstd/panicking.rs
index 8561ecd9c4c..490c5f4b352 100644
--- a/src/libstd/panicking.rs
+++ b/src/libstd/panicking.rs
@@ -16,6 +16,7 @@ use cell::Cell;
 use cell::RefCell;
 use intrinsics;
 use sync::StaticRwLock;
+use sync::atomic::{AtomicBool, Ordering};
 use sys::stdio::Stderr;
 use sys_common::backtrace;
 use sys_common::thread_info;
@@ -38,6 +39,7 @@ enum Handler {
 
 static HANDLER_LOCK: StaticRwLock = StaticRwLock::new();
 static mut HANDLER: Handler = Handler::Default;
+static FIRST_PANIC: AtomicBool = AtomicBool::new(true);
 
 /// Registers a custom panic handler, replacing any that was previously
 /// registered.
@@ -173,8 +175,11 @@ fn default_handler(info: &PanicInfo) {
     let write = |err: &mut ::io::Write| {
         let _ = writeln!(err, "thread '{}' panicked at '{}', {}:{}",
                          name, msg, file, line);
+
         if log_backtrace {
             let _ = backtrace::write(err);
+        } else if FIRST_PANIC.compare_and_swap(true, false, Ordering::SeqCst) {
+            let _ = writeln!(err, "note: Run with `RUST_BACKTRACE=1` for a backtrace.");
         }
     };