Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Panic setup msg #56176

Merged
merged 1 commit into from
Nov 25, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/librustc/session/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -802,7 +802,7 @@ macro_rules! options {
pub const parse_opt_uint: Option<&'static str> =
Some("a number");
pub const parse_panic_strategy: Option<&'static str> =
Some("either `panic` or `abort`");
Some("either `unwind` or `abort`");
pub const parse_relro_level: Option<&'static str> =
Some("one of: `full`, `partial`, or `off`");
pub const parse_sanitizer: Option<&'static str> =
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/panic-runtime/bad-panic-flag1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
// except according to those terms.

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

fn main() {}
2 changes: 1 addition & 1 deletion src/test/ui/panic-runtime/bad-panic-flag1.stderr
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
error: incorrect value `foo` for codegen option `panic` - either `panic` or `abort` was expected
error: incorrect value `foo` for codegen option `panic` - either `unwind` or `abort` was expected

2 changes: 1 addition & 1 deletion src/test/ui/panic-runtime/bad-panic-flag2.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
// except according to those terms.

// compile-flags:-C panic
// error-pattern:requires either `panic` or `abort`
// error-pattern:requires either `unwind` or `abort`

fn main() {}
2 changes: 1 addition & 1 deletion src/test/ui/panic-runtime/bad-panic-flag2.stderr
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
error: codegen option `panic` requires either `panic` or `abort` (C panic=<value>)
error: codegen option `panic` requires either `unwind` or `abort` (C panic=<value>)