diff options
| author | bors <bors@rust-lang.org> | 2014-11-12 05:27:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-11-12 05:27:02 +0000 |
| commit | 4d5e7f32492a5cc18f806fa96c3d863fa95fe688 (patch) | |
| tree | 49194402c6a1565285fb8b510f86103da7e3ee43 | |
| parent | e82f60eb471c4ee092bd4867f6946d271a620e71 (diff) | |
| parent | 2df9a085bd904dae7786a6c5d30e4a4057a16f22 (diff) | |
| download | rust-4d5e7f32492a5cc18f806fa96c3d863fa95fe688.tar.gz rust-4d5e7f32492a5cc18f806fa96c3d863fa95fe688.zip | |
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_.
| -rw-r--r-- | src/doc/guide.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/doc/guide.md b/src/doc/guide.md index 87816134378..473c30ab1c4 100644 --- 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 |