Auto merge of rust-lang#2372 - RalfJung:rustup, r=RalfJung

rustup

Cc rust-lang#99224

Author: bors

rust-version

@@ -1 +1 @@
-cbb07c27a4d78f95557a6b9cdcc32f98d67a0c22
+0ed9c64c3e63acac9bd77abce62501696c390450

src/shims/backtrace.rs

@@ -48,7 +48,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
             let mut span = frame.current_span();
             // Match the behavior of runtime backtrace spans
             // by using a non-macro span in our backtrace. See `FunctionCx::debug_loc`.
-            if span.from_expansion() && !tcx.sess.opts.debugging_opts.debug_macros {
+            if span.from_expansion() && !tcx.sess.opts.unstable_opts.debug_macros {
                 span = rustc_span::hygiene::walk_chain(span, frame.body.span.ctxt())
             }
             data.push((frame.instance, span.lo()));