summaryrefslogtreecommitdiff
path: root/thread.c
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-02-06 03:05:23 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-02-06 03:05:23 +0000
commitad68184e5a4344a5527cc0be7f203e7a5644f66c (patch)
treee5b7d2dab73fe89ecd8382896c25b0730de16e07 /thread.c
parent20a130427b8b3b96e4dd2409073f5154e9b836a4 (diff)
merge revision(s) 49428: [Backport #10694]
* thread.c: Improve documentation for Thread#value [Bug #10694][ruby-core:67324][ci skip] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@49522 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread.c')
-rw-r--r--thread.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/thread.c b/thread.c
index 5d8ac7eb04..35da97cde2 100644
--- a/thread.c
+++ b/thread.c
@@ -959,10 +959,14 @@ thread_join_m(int argc, VALUE *argv, VALUE self)
* call-seq:
* thr.value -> obj
*
- * Waits for +thr+ to complete, using #join, and returns its value.
+ * Waits for +thr+ to complete, using #join, and returns its value or raises
+ * the exception which terminated the thread.
*
* a = Thread.new { 2 + 2 }
* a.value #=> 4
+ *
+ * b = Thread.new { raise 'something went wrong' }
+ * b.value #=> RuntimeError: something went wrong
*/
static VALUE