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

Rustup
rust-lang · Apr 7, 2022 · dd2fefe · dd2fefe
2 parents 0e2def5 + 4331747
commit dd2fefe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-306ba8357fb36212b7d30efb9eb9e41659ac1445
+c2afaba465e0bf44b9b37beba8d908b78dcdadc7
diff --git a/src/machine.rs b/src/machine.rs
@@ -605,6 +605,7 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for Evaluator<'mir, 'tcx> {
 
     #[inline(always)]
     fn memory_read(
+        _tcx: TyCtxt<'tcx>,
         machine: &Self,
         alloc_extra: &AllocExtra,
         tag: Tag,
@@ -627,6 +628,7 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for Evaluator<'mir, 'tcx> {
 
     #[inline(always)]
     fn memory_written(
+        _tcx: TyCtxt<'tcx>,
         machine: &mut Self,
         alloc_extra: &mut AllocExtra,
         tag: Tag,
@@ -649,6 +651,7 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for Evaluator<'mir, 'tcx> {
 
     #[inline(always)]
     fn memory_deallocated(
+        _tcx: TyCtxt<'tcx>,
         machine: &mut Self,
         alloc_extra: &mut AllocExtra,
         tag: Tag,