diff --git a/src/eval.rs b/src/eval.rs index b87d735ce525..cfe856ec3a4d 100644 --- a/src/eval.rs +++ b/src/eval.rs @@ -9,7 +9,7 @@ use rustc::ty::{self, TyCtxt}; use syntax::source_map::DUMMY_SP; use crate::{ - struct_error, EnvVars, Evaluator, FnVal, HelpersEvalContextExt, InterpCx, InterpError, + EnvVars, Evaluator, FnVal, HelpersEvalContextExt, InterpCx, InterpError, InterpResult, MemoryExtra, MiriMemoryKind, Pointer, Scalar, StackPopCleanup, Tag, TlsEvalContextExt, }; @@ -221,7 +221,10 @@ pub fn eval_main<'tcx>(tcx: TyCtxt<'tcx>, main_id: DefId, config: MiriConfig) { }; let msg = format!("Miri evaluation error: {}", msg); - let mut err = struct_error(ecx.tcx.tcx.at(span), msg.as_str()); + let mut err = { + let new_tcx = ecx.tcx.tcx.at(span); + new_tcx.sess.struct_span_err(new_tcx.span, msg.as_str()) + }; let frames = ecx.generate_stacktrace(None); err.span_label(span, msg); // We iterate with indices because we need to look at the next frame (the caller).