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

rustup; support panic=abort on Windows Fixes #1058
rust-lang · Sep 20, 2020 · 5a15c8a · 5a15c8a
2 parents 1f6ce43 + 4b5e780
commit 5a15c8a
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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);