about summary refs log tree commit diff
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2018-03-17 17:20:49 +0800
committerGitHub <noreply@github.com>2018-03-17 17:20:49 +0800
commitef9581e757babc175cfabe1c01fb543d7c70a31f (patch)
tree0e12d5db512e0c21987cb7522f3c35e92ccc8648
parent7638c9fd84dbf502a3c2c9cb9ced969d1b724abb (diff)
parent4133b160363143b975cf9927cff87d183f1f5405 (diff)
downloadrust-ef9581e757babc175cfabe1c01fb543d7c70a31f.tar.gz
rust-ef9581e757babc175cfabe1c01fb543d7c70a31f.zip
Rollup merge of #49083 - oli-obk:mopsgeschwindigkeit, r=michaelwoerister
Only generate miri backtraces if explicitly requested

fixes #49072
fixes #48888

r? @michaelwoerister
-rw-r--r--src/librustc/mir/interpret/error.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc/mir/interpret/error.rs b/src/librustc/mir/interpret/error.rs
index 51660b180cd..9e69990f22c 100644
--- a/src/librustc/mir/interpret/error.rs
+++ b/src/librustc/mir/interpret/error.rs
@@ -20,7 +20,7 @@ pub struct EvalError<'tcx> {
 
 impl<'tcx> From<EvalErrorKind<'tcx>> for EvalError<'tcx> {
     fn from(kind: EvalErrorKind<'tcx>) -> Self {
-        let backtrace = match env::var("RUST_BACKTRACE") {
+        let backtrace = match env::var("MIRI_BACKTRACE") {
             Ok(ref val) if !val.is_empty() => Some(Backtrace::new_unresolved()),
             _ => None
         };