]> git.lizzy.rs Git - rust.git/commitdiff
Rollup merge of #33831 - diwic:patch-1, r=aturon
authorManish Goregaokar <manishsmail@gmail.com>
Sat, 28 May 2016 14:22:16 +0000 (19:52 +0530)
committerManish Goregaokar <manishsmail@gmail.com>
Sat, 28 May 2016 14:22:16 +0000 (19:52 +0530)
panic.rs: fix docs (recover -> catch_unwind)

The current docs are a bit inconsistent. First, change all references of "recover" to "catch_unwind" because the function was renamed. Second, consistently use the term "unwind safe" instead of "panic safe", "exception safe" and "recover safe" (all these terms were used previously).

1  2 
src/libstd/panic.rs

Simple merge