ruby-changes:29554
From: nagachika <ko1@a...>
Date: Tue, 25 Jun 2013 00:12:38 +0900 (JST)
Subject: [ruby-changes:29554] nagachika:r41606 (ruby_2_0_0): merge revision(s) 41593:
nagachika 2013-06-25 00:12:30 +0900 (Tue, 25 Jun 2013) New Revision: 41606 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=41606 Log: merge revision(s) 41593: * array.c: Return value in Array overview example found by @PragTob [Fix GH-336] https://github.com/ruby/ruby/pull/336 Modified directories: branches/ruby_2_0_0/ Modified files: branches/ruby_2_0_0/ChangeLog branches/ruby_2_0_0/array.c branches/ruby_2_0_0/version.h Index: ruby_2_0_0/array.c =================================================================== --- ruby_2_0_0/array.c (revision 41605) +++ ruby_2_0_0/array.c (revision 41606) @@ -5415,7 +5415,7 @@ rb_ary_drop_while(VALUE ary) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/array.c#L5415 * * arr = [1, 2, 3, 4, 5, 6] * arr.select { |a| a > 3 } #=> [4, 5, 6] - * arr.reject { |a| a < 3 } #=> [4, 5, 6] + * arr.reject { |a| a < 3 } #=> [3, 4, 5, 6] * arr.drop_while { |a| a < 4 } #=> [4, 5, 6] * arr #=> [1, 2, 3, 4, 5, 6] * Index: ruby_2_0_0/ChangeLog =================================================================== --- ruby_2_0_0/ChangeLog (revision 41605) +++ ruby_2_0_0/ChangeLog (revision 41606) @@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1 +Tue Jun 25 00:12:19 2013 Zachary Scott <zachary@z...> + + * array.c: Return value in Array overview example found by @PragTob + [Fix GH-336] https://github.com/ruby/ruby/pull/336 + Tue Jun 25 00:11:46 2013 Zachary Scott <zachary@z...> * array.c (rb_ary_zip): typo by @PragTob [Fix GH-337] Index: ruby_2_0_0/version.h =================================================================== --- ruby_2_0_0/version.h (revision 41605) +++ ruby_2_0_0/version.h (revision 41606) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1 #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2013-06-25" -#define RUBY_PATCHLEVEL 240 +#define RUBY_PATCHLEVEL 241 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 6 Property changes on: ruby_2_0_0 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r41593 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/