diff options
| author | bors <bors@rust-lang.org> | 2013-04-18 04:30:54 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-04-18 04:30:54 -0700 |
| commit | bd75463839f0b52283b0806166c19eb0ffa75732 (patch) | |
| tree | 1a77274bc709d8d5182fdfeeebf6b69335a584e7 /src | |
| parent | d29ef7ad255ba61a67047e8d3825feb3a6827444 (diff) | |
| parent | f43fc5fff898d2c2d0b2a49ec35daf1005e76dd9 (diff) | |
| download | rust-bd75463839f0b52283b0806166c19eb0ffa75732.tar.gz rust-bd75463839f0b52283b0806166c19eb0ffa75732.zip | |
auto merge of #5928 : huonw/rust/core-task-spawn-supervised-doc, r=thestinger
The doc-comment didn't reflect the [tasks tutorial](http://static.rust-lang.org/doc/tutorial-tasks.html#failure-modes), or how it works in practice.
Diffstat (limited to 'src')
| -rw-r--r-- | src/libcore/task/mod.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libcore/task/mod.rs b/src/libcore/task/mod.rs index a6c4b6c5268..2975f3d5e46 100644 --- a/src/libcore/task/mod.rs +++ b/src/libcore/task/mod.rs @@ -466,8 +466,9 @@ pub fn spawn_unlinked(f: ~fn()) { pub fn spawn_supervised(f: ~fn()) { /*! - * Creates a child task unlinked from the current one. If either this - * task or the child task fails, the other will not be killed. + * Creates a child task supervised by the current one. If the child + * task fails, the parent will not be killed, but if the parent fails, + * the child will be killed. */ task().supervised().spawn(f) |