Skip to content

Commit

Permalink
Rollup merge of rust-lang#49083 - oli-obk:mopsgeschwindigkeit, r=mich…
Browse files Browse the repository at this point in the history
…aelwoerister

Only generate miri backtraces if explicitly requested

fixes rust-lang#49072
fixes rust-lang#48888

r? @michaelwoerister
  • Loading branch information
kennytm authored Mar 17, 2018
2 parents 7638c9f + 4133b16 commit ef9581e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/librustc/mir/interpret/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
};
Expand Down

0 comments on commit ef9581e

Please sign in to comment.