Skip to content

Commit 5a15c8a

Browse files
committed
Auto merge of #1554 - RalfJung:rustup, r=RalfJung
rustup; support panic=abort on Windows Fixes #1058
2 parents 1f6ce43 + 4b5e780 commit 5a15c8a

File tree

5 files changed

+1
-5
lines changed

5 files changed

+1
-5
lines changed

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5e449b9adff463455743291b0c1f76feec092992
1+
41507ed0d57eba71adc20a021a19b64322162f04

tests/compile-fail/panic/panic_abort1.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// error-pattern: the evaluated program aborted execution
22
// compile-flags: -C panic=abort
3-
// ignore-windows: windows panics via inline assembly (FIXME)
43

54
fn main() {
65
std::panic!("panicking from libstd");

tests/compile-fail/panic/panic_abort2.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// error-pattern: the evaluated program aborted execution
22
// compile-flags: -C panic=abort
3-
// ignore-windows: windows panics via inline assembly (FIXME)
43

54
fn main() {
65
std::panic!("{}-panicking from libstd", 42);

tests/compile-fail/panic/panic_abort3.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// error-pattern: the evaluated program aborted execution
22
// compile-flags: -C panic=abort
3-
// ignore-windows: windows panics via inline assembly (FIXME)
43

54
fn main() {
65
core::panic!("panicking from libcore");

tests/compile-fail/panic/panic_abort4.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// error-pattern: the evaluated program aborted execution
22
// compile-flags: -C panic=abort
3-
// ignore-windows: windows panics via inline assembly (FIXME)
43

54
fn main() {
65
core::panic!("{}-panicking from libcore", 42);

0 commit comments

Comments
 (0)