From 12ba294b8d89227fbd6be33b9f9b7474cdf744e7 Mon Sep 17 00:00:00 2001 From: usa Date: Wed, 25 Feb 2015 05:20:53 +0000 Subject: 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 --- ChangeLog | 5 +++++ thread.c | 7 +++++-- version.h | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index d192ce1dc6..fdf49933ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Feb 25 14:19:35 2015 SHIBATA Hiroshi + + * thread.c: Improve documentation for Thread#value + [Bug #10694][ruby-core:67324][ci skip] + Wed Feb 25 14:18:26 2015 SHIBATA Hiroshi * string.c: [DOC] Add missing documentation around String#chomp. diff --git a/thread.c b/thread.c index 0923e8a093..7dbde3c1ba 100644 --- a/thread.c +++ b/thread.c @@ -899,11 +899,14 @@ thread_join_m(int argc, VALUE *argv, VALUE self) * call-seq: * thr.value -> obj * - * Waits for thr to complete (via Thread#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 diff --git a/version.h b/version.h index 543aa6821f..4cbd25c046 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2015-02-25" -#define RUBY_PATCHLEVEL 636 +#define RUBY_PATCHLEVEL 637 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 2 -- cgit v1.2.3