archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 49428: [Backport #10694]

Browse source 
* 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
This commit is contained in:
usa 2015-02-25 05:20:53 +00:00
parent b27d06d306
commit 12ba294b8d
3 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Wed Feb 25 14:19:35 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* thread.c: Improve documentation for Thread#value
[Bug #10694][ruby-core:67324][ci skip]
Wed Feb 25 14:18:26 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> Wed Feb 25 14:18:26 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* string.c: [DOC] Add missing documentation around String#chomp. * string.c: [DOC] Add missing documentation around String#chomp.

7
thread.c
View file

@ -899,11 +899,14 @@ thread_join_m(int argc, VALUE *argv, VALUE self)
* call-seq: * call-seq:
* thr.value -> obj * thr.value -> obj
* *
* Waits for <i>thr</i> to complete (via <code>Thread#join</code>) and returns * Waits for +thr+ to complete, using #join, and returns its value or raises
* its value. * the exception which terminated the thread.
* *
* a = Thread.new { 2 + 2 } * a = Thread.new { 2 + 2 }
* a.value #=> 4 * a.value #=> 4
*
* b = Thread.new { raise 'something went wrong' }
* b.value #=> RuntimeError: something went wrong
*/ */
static VALUE static VALUE

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0" #define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2015-02-25" #define RUBY_RELEASE_DATE "2015-02-25"
#define RUBY_PATCHLEVEL 636 #define RUBY_PATCHLEVEL 637
#define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 2 #define RUBY_RELEASE_MONTH 2