Skip to content

Commit

Permalink
Auto merge of #944 - rust-lang:rustup, r=oli-obk
Browse files Browse the repository at this point in the history
Rustup to 1.39.0-nightly (1e869133b 2019-09-09)
  • Loading branch information
bors committed Sep 9, 2019
2 parents 5b15139 + b952584 commit dd94c7c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion rust-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4894123d21ed4b153a2e5c32c0870cb2d97f9b46
1e869133b9888dc5abde54f4f31cb797ed9c7874
2 changes: 1 addition & 1 deletion tests/compile-fail/stack_free.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Validation changes why we fail
// compile-flags: -Zmiri-disable-validation

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

fn main() {
let x = 42;
Expand Down

0 comments on commit dd94c7c

Please sign in to comment.