Skip to content

Commit dd94c7c

Browse files
committed
Auto merge of #944 - rust-lang:rustup, r=oli-obk
Rustup to 1.39.0-nightly (1e869133b 2019-09-09)
2 parents 5b15139 + b952584 commit dd94c7c

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

rust-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4894123d21ed4b153a2e5c32c0870cb2d97f9b46
1+
1e869133b9888dc5abde54f4f31cb797ed9c7874

tests/compile-fail/stack_free.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Validation changes why we fail
22
// compile-flags: -Zmiri-disable-validation
33

4-
// error-pattern: tried to deallocate Stack memory but gave Machine(Rust) as the kind
4+
// error-pattern: tried to deallocate `Stack` memory but gave `Machine(Rust)` as the kind
55

66
fn main() {
77
let x = 42;

0 commit comments

Comments
 (0)