From 4b5e78052a030783a609ea0d9c5ad401261fc44d Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sun, 20 Sep 2020 15:55:36 +0200 Subject: [PATCH] rustup; support panic=abort on Windows --- rust-version | 2 +- tests/compile-fail/panic/panic_abort1.rs | 1 - tests/compile-fail/panic/panic_abort2.rs | 1 - tests/compile-fail/panic/panic_abort3.rs | 1 - tests/compile-fail/panic/panic_abort4.rs | 1 - 5 files changed, 1 insertion(+), 5 deletions(-) diff --git a/rust-version b/rust-version index 3126a8a9128..92bdd16b2be 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -5e449b9adff463455743291b0c1f76feec092992 +41507ed0d57eba71adc20a021a19b64322162f04 diff --git a/tests/compile-fail/panic/panic_abort1.rs b/tests/compile-fail/panic/panic_abort1.rs index ee1d5b312d5..02f8f25880f 100644 --- a/tests/compile-fail/panic/panic_abort1.rs +++ b/tests/compile-fail/panic/panic_abort1.rs @@ -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"); diff --git a/tests/compile-fail/panic/panic_abort2.rs b/tests/compile-fail/panic/panic_abort2.rs index 4c08ab4ddcb..0d6808dd22e 100644 --- a/tests/compile-fail/panic/panic_abort2.rs +++ b/tests/compile-fail/panic/panic_abort2.rs @@ -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); diff --git a/tests/compile-fail/panic/panic_abort3.rs b/tests/compile-fail/panic/panic_abort3.rs index 81a603d5e36..6640a56c0be 100644 --- a/tests/compile-fail/panic/panic_abort3.rs +++ b/tests/compile-fail/panic/panic_abort3.rs @@ -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"); diff --git a/tests/compile-fail/panic/panic_abort4.rs b/tests/compile-fail/panic/panic_abort4.rs index d015316ef26..d39b1794e67 100644 --- a/tests/compile-fail/panic/panic_abort4.rs +++ b/tests/compile-fail/panic/panic_abort4.rs @@ -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); -- 2.44.0