Skip to content

Commit 4381772

Browse files
Fix invalid panic setup message
1 parent b76ee83 commit 4381772

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

src/librustc/session/config.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -802,7 +802,7 @@ macro_rules! options {
802802
pub const parse_opt_uint: Option<&'static str> =
803803
Some("a number");
804804
pub const parse_panic_strategy: Option<&'static str> =
805-
Some("either `panic` or `abort`");
805+
Some("either `unwind` or `abort`");
806806
pub const parse_relro_level: Option<&'static str> =
807807
Some("one of: `full`, `partial`, or `off`");
808808
pub const parse_sanitizer: Option<&'static str> =

src/test/ui/panic-runtime/bad-panic-flag1.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
// except according to those terms.
1010

1111
// compile-flags:-C panic=foo
12-
// error-pattern:either `panic` or `abort` was expected
12+
// error-pattern:either `unwind` or `abort` was expected
1313

1414
fn main() {}
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
error: incorrect value `foo` for codegen option `panic` - either `panic` or `abort` was expected
1+
error: incorrect value `foo` for codegen option `panic` - either `unwind` or `abort` was expected
22

src/test/ui/panic-runtime/bad-panic-flag2.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
// except according to those terms.
1010

1111
// compile-flags:-C panic
12-
// error-pattern:requires either `panic` or `abort`
12+
// error-pattern:requires either `unwind` or `abort`
1313

1414
fn main() {}
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
error: codegen option `panic` requires either `panic` or `abort` (C panic=<value>)
1+
error: codegen option `panic` requires either `unwind` or `abort` (C panic=<value>)
22

0 commit comments

Comments
 (0)