diff options
| author | bors <bors@rust-lang.org> | 2013-10-22 09:24:48 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-10-22 09:24:48 -0700 |
| commit | fd2c0128a7dd3cb19eda253acd01cd7905d1c7dc (patch) | |
| tree | 5e61220d514b0e59df849455008695490b2e4f42 /src/libstd/rt/kill.rs | |
| parent | cd8c7cf61239d4f23868b8765207026f602a79db (diff) | |
| parent | 3ed18bdd42e10f57890befe015f6861d52429e12 (diff) | |
| download | rust-fd2c0128a7dd3cb19eda253acd01cd7905d1c7dc.tar.gz rust-fd2c0128a7dd3cb19eda253acd01cd7905d1c7dc.zip | |
auto merge of #10006 : alexcrichton/rust/another-massive-rename, r=brson
Drop the `2` suffix on all of them, updating all code in the process of doing so. This is a completely automated change, and it's dependent on the snapshots going through.
Diffstat (limited to 'src/libstd/rt/kill.rs')
| -rw-r--r-- | src/libstd/rt/kill.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libstd/rt/kill.rs b/src/libstd/rt/kill.rs index 6043ae318fe..8029e3f6431 100644 --- a/src/libstd/rt/kill.rs +++ b/src/libstd/rt/kill.rs @@ -403,7 +403,7 @@ impl KillHandle { // FIXME(#7544)(bblum): is it really necessary to prohibit double kill? match inner.unkillable.compare_and_swap(KILL_RUNNING, KILL_UNKILLABLE, Relaxed) { KILL_RUNNING => { }, // normal case - KILL_KILLED => if !already_failing { fail2!("{}", KILLED_MSG) }, + KILL_KILLED => if !already_failing { fail!("{}", KILLED_MSG) }, _ => rtabort!("inhibit_kill: task already unkillable"), } } @@ -416,7 +416,7 @@ impl KillHandle { // FIXME(#7544)(bblum): is it really necessary to prohibit double kill? match inner.unkillable.compare_and_swap(KILL_UNKILLABLE, KILL_RUNNING, Relaxed) { KILL_UNKILLABLE => { }, // normal case - KILL_KILLED => if !already_failing { fail2!("{}", KILLED_MSG) }, + KILL_KILLED => if !already_failing { fail!("{}", KILLED_MSG) }, _ => rtabort!("allow_kill: task already killable"), } } @@ -624,7 +624,7 @@ impl Death { // synchronization during unwinding or cleanup (for example, // sending on a notify port). In that case failing won't help. if self.unkillable == 0 && (!already_failing) && kill_handle.killed() { - fail2!("{}", KILLED_MSG); + fail!("{}", KILLED_MSG); }, // This may happen during task death (see comments in collect_failure). None => rtassert!(self.unkillable > 0), @@ -650,7 +650,7 @@ impl Death { if self.unkillable == 0 { // we need to decrement the counter before failing. self.unkillable -= 1; - fail2!("Cannot enter a rekillable() block without a surrounding unkillable()"); + fail!("Cannot enter a rekillable() block without a surrounding unkillable()"); } self.unkillable -= 1; if self.unkillable == 0 { |