diff options
| author | Wangshan Lu <wisagan@gmail.com> | 2016-05-22 22:36:55 +0800 |
|---|---|---|
| committer | Wangshan Lu <wisagan@gmail.com> | 2016-05-22 22:42:10 +0800 |
| commit | 226bcdf7d1e774f5967f92b0bd0bf237179f95c9 (patch) | |
| tree | a1297f8449a1188e1c6406a952c81a25fba4e887 /src/test | |
| parent | e24d621fcacf59fa8ecc1c1af1c4adeded4bddee (diff) | |
| download | rust-226bcdf7d1e774f5967f92b0bd0bf237179f95c9.tar.gz rust-226bcdf7d1e774f5967f92b0bd0bf237179f95c9.zip | |
Rename main thread from "<main>" to "main".
Fix issue #33789
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/run-fail/main-panic.rs | 2 | ||||
| -rw-r--r-- | src/test/run-fail/overflowing-add.rs | 2 | ||||
| -rw-r--r-- | src/test/run-fail/overflowing-lsh-1.rs | 2 | ||||
| -rw-r--r-- | src/test/run-fail/overflowing-lsh-2.rs | 2 | ||||
| -rw-r--r-- | src/test/run-fail/overflowing-lsh-3.rs | 2 | ||||
| -rw-r--r-- | src/test/run-fail/overflowing-lsh-4.rs | 2 | ||||
| -rw-r--r-- | src/test/run-fail/overflowing-mul.rs | 2 | ||||
| -rw-r--r-- | src/test/run-fail/overflowing-neg.rs | 2 | ||||
| -rw-r--r-- | src/test/run-fail/overflowing-pow.rs | 2 | ||||
| -rw-r--r-- | src/test/run-fail/overflowing-rsh-1.rs | 2 | ||||
| -rw-r--r-- | src/test/run-fail/overflowing-rsh-2.rs | 2 | ||||
| -rw-r--r-- | src/test/run-fail/overflowing-rsh-3.rs | 2 | ||||
| -rw-r--r-- | src/test/run-fail/overflowing-rsh-4.rs | 2 | ||||
| -rw-r--r-- | src/test/run-fail/overflowing-rsh-5.rs | 2 | ||||
| -rw-r--r-- | src/test/run-fail/overflowing-rsh-6.rs | 2 | ||||
| -rw-r--r-- | src/test/run-fail/overflowing-sub.rs | 2 | ||||
| -rw-r--r-- | src/test/run-fail/panic-set-unset-handler.rs | 2 | ||||
| -rw-r--r-- | src/test/run-fail/panic-take-handler-nop.rs | 2 | ||||
| -rw-r--r-- | src/test/run-pass/multi-panic.rs | 2 |
19 files changed, 19 insertions, 19 deletions
diff --git a/src/test/run-fail/main-panic.rs b/src/test/run-fail/main-panic.rs index b8ff1be71bf..87f77681fa0 100644 --- a/src/test/run-fail/main-panic.rs +++ b/src/test/run-fail/main-panic.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// error-pattern:thread '<main>' panicked at +// error-pattern:thread 'main' panicked at fn main() { panic!() diff --git a/src/test/run-fail/overflowing-add.rs b/src/test/run-fail/overflowing-add.rs index c989cc59453..26cc9eda046 100644 --- a/src/test/run-fail/overflowing-add.rs +++ b/src/test/run-fail/overflowing-add.rs @@ -10,7 +10,7 @@ // ignore-pretty : (#23623) problems when ending with // comments -// error-pattern:thread '<main>' panicked at 'arithmetic operation overflowed' +// error-pattern:thread 'main' panicked at 'arithmetic operation overflowed' // compile-flags: -C debug-assertions diff --git a/src/test/run-fail/overflowing-lsh-1.rs b/src/test/run-fail/overflowing-lsh-1.rs index a2721011298..4648f5c9c79 100644 --- a/src/test/run-fail/overflowing-lsh-1.rs +++ b/src/test/run-fail/overflowing-lsh-1.rs @@ -10,7 +10,7 @@ // ignore-pretty : (#23623) problems when ending with // comments -// error-pattern:thread '<main>' panicked at 'shift operation overflowed' +// error-pattern:thread 'main' panicked at 'shift operation overflowed' // compile-flags: -C debug-assertions #![warn(exceeding_bitshifts)] diff --git a/src/test/run-fail/overflowing-lsh-2.rs b/src/test/run-fail/overflowing-lsh-2.rs index fe0bcc5b985..12741864eda 100644 --- a/src/test/run-fail/overflowing-lsh-2.rs +++ b/src/test/run-fail/overflowing-lsh-2.rs @@ -10,7 +10,7 @@ // ignore-pretty : (#23623) problems when ending with // comments -// error-pattern:thread '<main>' panicked at 'shift operation overflowed' +// error-pattern:thread 'main' panicked at 'shift operation overflowed' // compile-flags: -C debug-assertions #![warn(exceeding_bitshifts)] diff --git a/src/test/run-fail/overflowing-lsh-3.rs b/src/test/run-fail/overflowing-lsh-3.rs index aac220d32d9..76e029bab52 100644 --- a/src/test/run-fail/overflowing-lsh-3.rs +++ b/src/test/run-fail/overflowing-lsh-3.rs @@ -10,7 +10,7 @@ // ignore-pretty : (#23623) problems when ending with // comments -// error-pattern:thread '<main>' panicked at 'shift operation overflowed' +// error-pattern:thread 'main' panicked at 'shift operation overflowed' // compile-flags: -C debug-assertions #![warn(exceeding_bitshifts)] diff --git a/src/test/run-fail/overflowing-lsh-4.rs b/src/test/run-fail/overflowing-lsh-4.rs index 7e8b266da49..a9ee4b88253 100644 --- a/src/test/run-fail/overflowing-lsh-4.rs +++ b/src/test/run-fail/overflowing-lsh-4.rs @@ -10,7 +10,7 @@ // ignore-pretty : (#23623) problems when ending with // comments -// error-pattern:thread '<main>' panicked at 'shift operation overflowed' +// error-pattern:thread 'main' panicked at 'shift operation overflowed' // compile-flags: -C debug-assertions // This function is checking that our automatic truncation does not diff --git a/src/test/run-fail/overflowing-mul.rs b/src/test/run-fail/overflowing-mul.rs index 8cba700bbf9..179622e49a6 100644 --- a/src/test/run-fail/overflowing-mul.rs +++ b/src/test/run-fail/overflowing-mul.rs @@ -10,7 +10,7 @@ // ignore-pretty : (#23623) problems when ending with // comments -// error-pattern:thread '<main>' panicked at 'arithmetic operation overflowed' +// error-pattern:thread 'main' panicked at 'arithmetic operation overflowed' // compile-flags: -C debug-assertions #![feature(rustc_attrs)] diff --git a/src/test/run-fail/overflowing-neg.rs b/src/test/run-fail/overflowing-neg.rs index 2d9d746bef3..2bc625f692e 100644 --- a/src/test/run-fail/overflowing-neg.rs +++ b/src/test/run-fail/overflowing-neg.rs @@ -10,7 +10,7 @@ // ignore-pretty : (#23623) problems when ending with // comments -// error-pattern:thread '<main>' panicked at 'attempted to negate with overflow' +// error-pattern:thread 'main' panicked at 'attempted to negate with overflow' // compile-flags: -C debug-assertions #![feature(rustc_attrs)] diff --git a/src/test/run-fail/overflowing-pow.rs b/src/test/run-fail/overflowing-pow.rs index 15335b8dfb1..e9fea9e1141 100644 --- a/src/test/run-fail/overflowing-pow.rs +++ b/src/test/run-fail/overflowing-pow.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// error-pattern:thread '<main>' panicked at 'arithmetic operation overflowed' +// error-pattern:thread 'main' panicked at 'arithmetic operation overflowed' // compile-flags: -C debug-assertions fn main() { diff --git a/src/test/run-fail/overflowing-rsh-1.rs b/src/test/run-fail/overflowing-rsh-1.rs index 63c808dc80a..d37ea693a9f 100644 --- a/src/test/run-fail/overflowing-rsh-1.rs +++ b/src/test/run-fail/overflowing-rsh-1.rs @@ -10,7 +10,7 @@ // ignore-pretty : (#23623) problems when ending with // comments -// error-pattern:thread '<main>' panicked at 'shift operation overflowed' +// error-pattern:thread 'main' panicked at 'shift operation overflowed' // compile-flags: -C debug-assertions #![warn(exceeding_bitshifts)] diff --git a/src/test/run-fail/overflowing-rsh-2.rs b/src/test/run-fail/overflowing-rsh-2.rs index 8b89e57c85b..a4b7028a474 100644 --- a/src/test/run-fail/overflowing-rsh-2.rs +++ b/src/test/run-fail/overflowing-rsh-2.rs @@ -10,7 +10,7 @@ // ignore-pretty : (#23623) problems when ending with // comments -// error-pattern:thread '<main>' panicked at 'shift operation overflowed' +// error-pattern:thread 'main' panicked at 'shift operation overflowed' // compile-flags: -C debug-assertions #![warn(exceeding_bitshifts)] diff --git a/src/test/run-fail/overflowing-rsh-3.rs b/src/test/run-fail/overflowing-rsh-3.rs index 8874587064c..199da59eb53 100644 --- a/src/test/run-fail/overflowing-rsh-3.rs +++ b/src/test/run-fail/overflowing-rsh-3.rs @@ -10,7 +10,7 @@ // ignore-pretty : (#23623) problems when ending with // comments -// error-pattern:thread '<main>' panicked at 'shift operation overflowed' +// error-pattern:thread 'main' panicked at 'shift operation overflowed' // compile-flags: -C debug-assertions #![warn(exceeding_bitshifts)] diff --git a/src/test/run-fail/overflowing-rsh-4.rs b/src/test/run-fail/overflowing-rsh-4.rs index d74fd8a6b8e..d0d89a310e2 100644 --- a/src/test/run-fail/overflowing-rsh-4.rs +++ b/src/test/run-fail/overflowing-rsh-4.rs @@ -10,7 +10,7 @@ // ignore-pretty : (#23623) problems when ending with // comments -// error-pattern:thread '<main>' panicked at 'shift operation overflowed' +// error-pattern:thread 'main' panicked at 'shift operation overflowed' // compile-flags: -C debug-assertions // This function is checking that our (type-based) automatic diff --git a/src/test/run-fail/overflowing-rsh-5.rs b/src/test/run-fail/overflowing-rsh-5.rs index 249b952a5dc..03588c3576a 100644 --- a/src/test/run-fail/overflowing-rsh-5.rs +++ b/src/test/run-fail/overflowing-rsh-5.rs @@ -10,7 +10,7 @@ // ignore-pretty : (#23623) problems when ending with // comments -// error-pattern:thread '<main>' panicked at 'shift operation overflowed' +// error-pattern:thread 'main' panicked at 'shift operation overflowed' // compile-flags: -C debug-assertions #![warn(exceeding_bitshifts)] diff --git a/src/test/run-fail/overflowing-rsh-6.rs b/src/test/run-fail/overflowing-rsh-6.rs index 1227f35444a..914f6d2b5c4 100644 --- a/src/test/run-fail/overflowing-rsh-6.rs +++ b/src/test/run-fail/overflowing-rsh-6.rs @@ -10,7 +10,7 @@ // ignore-pretty : (#23623) problems when ending with // comments -// error-pattern:thread '<main>' panicked at 'shift operation overflowed' +// error-pattern:thread 'main' panicked at 'shift operation overflowed' // compile-flags: -C debug-assertions #![warn(exceeding_bitshifts)] diff --git a/src/test/run-fail/overflowing-sub.rs b/src/test/run-fail/overflowing-sub.rs index ce243a50e0b..7eec7699d99 100644 --- a/src/test/run-fail/overflowing-sub.rs +++ b/src/test/run-fail/overflowing-sub.rs @@ -10,7 +10,7 @@ // ignore-pretty : (#23623) problems when ending with // comments -// error-pattern:thread '<main>' panicked at 'arithmetic operation overflowed' +// error-pattern:thread 'main' panicked at 'arithmetic operation overflowed' // compile-flags: -C debug-assertions #![feature(rustc_attrs)] diff --git a/src/test/run-fail/panic-set-unset-handler.rs b/src/test/run-fail/panic-set-unset-handler.rs index 6999aa715e7..b4b926f1ba3 100644 --- a/src/test/run-fail/panic-set-unset-handler.rs +++ b/src/test/run-fail/panic-set-unset-handler.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// error-pattern:thread '<main>' panicked at 'foobar' +// error-pattern:thread 'main' panicked at 'foobar' #![feature(std_panic, panic_handler)] use std::panic; diff --git a/src/test/run-fail/panic-take-handler-nop.rs b/src/test/run-fail/panic-take-handler-nop.rs index fec1db24adf..928f73a2ab2 100644 --- a/src/test/run-fail/panic-take-handler-nop.rs +++ b/src/test/run-fail/panic-take-handler-nop.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// error-pattern:thread '<main>' panicked at 'foobar' +// error-pattern:thread 'main' panicked at 'foobar' #![feature(std_panic, panic_handler)] use std::panic; diff --git a/src/test/run-pass/multi-panic.rs b/src/test/run-pass/multi-panic.rs index 8e0b14128c8..93e2a854ccb 100644 --- a/src/test/run-pass/multi-panic.rs +++ b/src/test/run-pass/multi-panic.rs @@ -15,7 +15,7 @@ fn check_for_no_backtrace(test: std::process::Output) { assert_eq!(it.next().map(|l| l.starts_with("thread '<unnamed>' panicked at")), Some(true)); assert_eq!(it.next(), Some("note: Run with `RUST_BACKTRACE=1` for a backtrace.")); - assert_eq!(it.next().map(|l| l.starts_with("thread '<main>' panicked at")), Some(true)); + assert_eq!(it.next().map(|l| l.starts_with("thread 'main' panicked at")), Some(true)); assert_eq!(it.next(), None); } |
