about summary refs log tree commit diff
path: root/src/test/ui/panic-runtime
diff options
context:
space:
mode:
authorEric Huss <eric@huss.org>2018-11-19 13:29:35 -0800
committerEric Huss <eric@huss.org>2018-11-19 13:29:35 -0800
commitb8da7190243faca8dc0a5173496034b772ff4449 (patch)
tree416b3c3136c3740cc4d2274cc8bee38f2c4ceef5 /src/test/ui/panic-runtime
parent39852cae2b7486a7fb15a90866b9ad0b7bb7615d (diff)
downloadrust-b8da7190243faca8dc0a5173496034b772ff4449.tar.gz
rust-b8da7190243faca8dc0a5173496034b772ff4449.zip
Fix error message for `-C panic=xxx`.
Diffstat (limited to 'src/test/ui/panic-runtime')
-rw-r--r--src/test/ui/panic-runtime/bad-panic-flag1.rs2
-rw-r--r--src/test/ui/panic-runtime/bad-panic-flag1.stderr2
-rw-r--r--src/test/ui/panic-runtime/bad-panic-flag2.rs2
-rw-r--r--src/test/ui/panic-runtime/bad-panic-flag2.stderr2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/test/ui/panic-runtime/bad-panic-flag1.rs b/src/test/ui/panic-runtime/bad-panic-flag1.rs
index f067b6b8349..4e553c4df2f 100644
--- a/src/test/ui/panic-runtime/bad-panic-flag1.rs
+++ b/src/test/ui/panic-runtime/bad-panic-flag1.rs
@@ -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() {}
diff --git a/src/test/ui/panic-runtime/bad-panic-flag1.stderr b/src/test/ui/panic-runtime/bad-panic-flag1.stderr
index 3a65419c98f..013373c6f93 100644
--- a/src/test/ui/panic-runtime/bad-panic-flag1.stderr
+++ b/src/test/ui/panic-runtime/bad-panic-flag1.stderr
@@ -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
 
diff --git a/src/test/ui/panic-runtime/bad-panic-flag2.rs b/src/test/ui/panic-runtime/bad-panic-flag2.rs
index 0ecf65f080f..f560e7f4eb2 100644
--- a/src/test/ui/panic-runtime/bad-panic-flag2.rs
+++ b/src/test/ui/panic-runtime/bad-panic-flag2.rs
@@ -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() {}
diff --git a/src/test/ui/panic-runtime/bad-panic-flag2.stderr b/src/test/ui/panic-runtime/bad-panic-flag2.stderr
index 8d919e55c90..6ab94ea704d 100644
--- a/src/test/ui/panic-runtime/bad-panic-flag2.stderr
+++ b/src/test/ui/panic-runtime/bad-panic-flag2.stderr
@@ -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>)