From: Ralf Jung <post@ralfj.de>
Date: Tue, 7 Apr 2020 17:33:03 +0000 (+0200)
Subject: rustup
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=7841f445932096adcf07944b707af73fc73830f1;p=rust.git

rustup
---

diff --git a/rust-version b/rust-version
index 6e980a4e228..b1fd330a9d6 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-e6cef0445779724b469ab7b9a8d3c05d9e848ca8
+42abbd8878d3b67238f3611b0587c704ba94f39c
diff --git a/tests/compile-fail/stack_free.rs b/tests/compile-fail/stack_free.rs
index ea09d3e2b44..50a590e448a 100644
--- a/tests/compile-fail/stack_free.rs
+++ b/tests/compile-fail/stack_free.rs
@@ -1,7 +1,7 @@
 // Validation/SB changes why we fail
 // compile-flags: -Zmiri-disable-validation -Zmiri-disable-stacked-borrows
 
-// error-pattern: deallocating `Stack` memory using `Machine(Rust)` deallocation operation
+// error-pattern: deallocating stack variable memory using Rust heap deallocation operation
 
 fn main() {
     let x = 42;