auto merge of #18833 : slashgrin/rust/patch-1, r=brson

Should refer to handling panicking tasks like any other computation that may _fail_, not any other computation that may _panic_.
2014-11-12 05:27:02 +00:00 · 2014-11-12 05:27:02 +00:00 · 4d5e7f3249
commit 4d5e7f3249
parent e82f60eb47 2df9a085bd
1 changed files with 1 additions and 1 deletions
--- a/src/doc/guide.md
+++ b/src/doc/guide.md
@ -5274,7 +5274,7 @@ let result = task::try(proc() {

 This task will randomly panic or succeed. `task::try` returns a `Result`
 type, so we can handle the response like any other computation that may
-panic.
+fail.

 # Macros