Auto merge of #2009 - RalfJung:rustup, r=RalfJung

rustup

Author: bors

rust-version

@@ -1 +1 @@
-d137c3a7bd3b180317044f8ccb9a8b4b3bb07db3
+89adcc636f94d34a6fc90fa117e28ddf6be7b983

src/shims/backtrace.rs

@@ -105,7 +105,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
         // which we pass to user code.
         let fn_ptr = this.memory.create_fn_alloc(FnVal::Instance(fn_instance));
 
-        let num_fields = dest.layout.layout.fields.count();
+        let num_fields = dest.layout.fields.count();
 
         if !(4..=5).contains(&num_fields) {
             // Always mention 5 fields, since the 4-field struct