about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2018-12-14 22:10:17 +0800
committerkennytm <kennytm@gmail.com>2018-12-14 22:17:43 +0800
commit123b72a05e140b7b39bb60b4ef8a24d32091b83d (patch)
treeed708bebd7b87b2b6b942e539d7af4503019b671 /src/libstd
parent7ec1faa27a83038dc4df2a3a916f0dc5e99cdf0d (diff)
parent6057147fde962f2369c61f8dbf74dd2b1b2ce239 (diff)
downloadrust-123b72a05e140b7b39bb60b4ef8a24d32091b83d.tar.gz
rust-123b72a05e140b7b39bb60b4ef8a24d32091b83d.zip
Rollup merge of #56748 - kinnison:kinnison/fix-56734, r=dtolnay
Update panic message to be clearer about env-vars

Esteban Kuber requested that the panic message make it clear
that `RUST_BACKTRACE=1` is an environment variable.  This change
makes that clear.

I understand that this may simply be closed if the concept isn't accepted, and I'd be fine with that :-)

Fixes #56734
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/panicking.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libstd/panicking.rs b/src/libstd/panicking.rs
index 6b47ba6d1cb..b6180fbeb50 100644
--- a/src/libstd/panicking.rs
+++ b/src/libstd/panicking.rs
@@ -209,7 +209,8 @@ fn default_hook(info: &PanicInfo) {
             if let Some(format) = log_backtrace {
                 let _ = backtrace::print(err, format);
             } else if FIRST_PANIC.compare_and_swap(true, false, Ordering::SeqCst) {
-                let _ = writeln!(err, "note: Run with `RUST_BACKTRACE=1` for a backtrace.");
+                let _ = writeln!(err, "note: Run with `RUST_BACKTRACE=1` \
+                                       environment variable to display a backtrace.");
             }
         }
     };