diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-25 05:20:53 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-25 05:20:53 +0000 |
commit | 12ba294b8d89227fbd6be33b9f9b7474cdf744e7 (patch) | |
tree | 68eea1d62954869d361aae85867d4bc60345eff6 /thread.c | |
parent | b27d06d30664c80600f832dd1f6cb653efa8ec1f (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_0_0@49734 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread.c')
-rw-r--r-- | thread.c | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -899,11 +899,14 @@ thread_join_m(int argc, VALUE *argv, VALUE self) * call-seq: * thr.value -> obj * - * Waits for <i>thr</i> to complete (via <code>Thread#join</code>) 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 |