archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-24 05:25:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) r49428: [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_1@49912 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2015-03-09 17:40:36 +00:00
parent 51e8c8199c
commit db0f860308
3 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Tue Mar 10 02:40:11 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* thread.c: Improve documentation for Thread#value
[Bug #10694][ruby-core:67324][ci skip]
Tue Mar 10 02:37:55 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> Tue Mar 10 02:37:55 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.

6
thread.c
View file

@ -916,10 +916,14 @@ thread_join_m(int argc, VALUE *argv, VALUE self)
* call-seq: * call-seq:
* thr.value -> obj * 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 = 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.1.5" #define RUBY_VERSION "2.1.5"
#define RUBY_RELEASE_DATE "2015-03-10" #define RUBY_RELEASE_DATE "2015-03-10"
#define RUBY_PATCHLEVEL 311 #define RUBY_PATCHLEVEL 312
#define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 3 #define RUBY_RELEASE_MONTH 3