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

rustup; support panic=abort on Windows

Fixes https://github.com/rust-lang/miri/issues/1058
This commit is contained in:
bors 2020-09-20 13:56:59 +00:00
commit 5a15c8a6dd
5 changed files with 1 additions and 5 deletions

View File

@ -1 +1 @@
5e449b9adff463455743291b0c1f76feec092992
41507ed0d57eba71adc20a021a19b64322162f04

View File

@ -1,6 +1,5 @@
// error-pattern: the evaluated program aborted execution
// compile-flags: -C panic=abort
// ignore-windows: windows panics via inline assembly (FIXME)
fn main() {
std::panic!("panicking from libstd");

View File

@ -1,6 +1,5 @@
// error-pattern: the evaluated program aborted execution
// compile-flags: -C panic=abort
// ignore-windows: windows panics via inline assembly (FIXME)
fn main() {
std::panic!("{}-panicking from libstd", 42);

View File

@ -1,6 +1,5 @@
// error-pattern: the evaluated program aborted execution
// compile-flags: -C panic=abort
// ignore-windows: windows panics via inline assembly (FIXME)
fn main() {
core::panic!("panicking from libcore");

View File

@ -1,6 +1,5 @@
// error-pattern: the evaluated program aborted execution
// compile-flags: -C panic=abort
// ignore-windows: windows panics via inline assembly (FIXME)
fn main() {
core::panic!("{}-panicking from libcore", 42);