diff --git a/rust-version b/rust-version index fb6d167ec64..a829ec0f5a0 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -nightly-2018-11-12 +nightly-2018-11-15 diff --git a/src/lib.rs b/src/lib.rs index ab34841df89..b7deb8ee116 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -446,15 +446,6 @@ impl<'a, 'mir, 'tcx> Machine<'a, 'mir, 'tcx> for Evaluator<'tcx> { Cow::Owned(alloc) } - #[inline(always)] - fn memory_deallocated( - alloc: &mut Allocation, - ptr: Pointer, - size: Size, - ) -> EvalResult<'tcx> { - alloc.extra.memory_deallocated(ptr, size) - } - #[inline(always)] fn tag_reference( ecx: &mut EvalContext<'a, 'mir, 'tcx, Self>, diff --git a/src/stacked_borrows.rs b/src/stacked_borrows.rs index 475033d74c6..c6cd7f5005d 100644 --- a/src/stacked_borrows.rs +++ b/src/stacked_borrows.rs @@ -363,20 +363,20 @@ impl AllocationExtra for Stacks { // Writes behave exactly like the first half of a reborrow-to-mut alloc.extra.use_and_maybe_re_borrow(ptr, size, UsageKind::Write, None) } -} -impl<'tcx> Stacks { #[inline(always)] - pub fn memory_deallocated( - &mut self, + fn memory_deallocated<'tcx>( + alloc: &mut Allocation, ptr: Pointer, size: Size, ) -> EvalResult<'tcx> { // This is like mutating - self.use_and_maybe_re_borrow(ptr, size, UsageKind::Write, None) + alloc.extra.use_and_maybe_re_borrow(ptr, size, UsageKind::Write, None) // FIXME: Error out of there are any barriers? } +} +impl<'tcx> Stacks { /// Pushes the first item to the stacks. pub fn first_item( &mut self,