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

rustup for retag rename

This is the Miri side of rust-lang/rust#64503. Do not force-push!

Author: bors

rust-version

@@ -1 +1 @@
-a44881d892fb4f4a8ed93f8f392bab942fac7a41
+64c09694a6ecc434cd3a61ade89beb1de17770c5

src/machine.rs

@@ -287,7 +287,7 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for Evaluator<'tcx> {
             (Some(stacks), base_tag)
         };
         let mut stacked_borrows = memory_extra.stacked_borrows.borrow_mut();
-        let alloc: Allocation<Tag, Self::AllocExtra> = alloc.retag(
+        let alloc: Allocation<Tag, Self::AllocExtra> = alloc.with_tags_and_extra(
             |alloc| if !memory_extra.validate {
                 Tag::Untagged
             } else {