nagachika	2013-10-11 00:09:36 +0900 (Fri, 11 Oct 2013)

  New Revision: 43242

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=43242

  Log:
    merge revision(s) 42068,42069: [Backport #8654]
    
    Suppress warnings.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/test/ruby/test_array.rb
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 43241)
+++ ruby_2_0_0/version.h	(revision 43242)
@@ -1,10 +1,10 @@ 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-10-10"
-#define RUBY_PATCHLEVEL 334
+#define RUBY_RELEASE_DATE "2013-10-11"
+#define RUBY_PATCHLEVEL 335
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 10
-#define RUBY_RELEASE_DAY 10
+#define RUBY_RELEASE_DAY 11
 
 #include "ruby/version.h"
 
Index: ruby_2_0_0/test/ruby/test_array.rb
===================================================================
--- ruby_2_0_0/test/ruby/test_array.rb	(revision 43241)
+++ ruby_2_0_0/test/ruby/test_array.rb	(revision 43242)
@@ -581,7 +581,7 @@ class TestArray < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/ruby/test_array.rb#L581
     assert_in_out_err [], <<-EOS, ["0"], [], bug8654
       a1 = []
       a2 = Array.new(100) { |i| i }
-      r = a2.count do |i|
+      a2.count do |i|
         p i
         a2.replace(a1) if i == 0
       end
@@ -590,6 +590,7 @@ class TestArray < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/ruby/test_array.rb#L590
     assert_in_out_err [], <<-EOS, ["[]", "0"], [], bug8654
       ARY = Array.new(100) { |i| i }
       class Fixnum
+        alias old_equal ==
         def == other
           ARY.replace([]) if self.equal?(0)
           p ARY
@@ -1694,8 +1695,8 @@ class TestArray < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/ruby/test_array.rb#L1695
                       [2,2,2,2],[2,2,2,3],[2,2,3,3],[2,3,3,3],[3,3,3,3]],
                  a.repeated_combination(4).to_a.sort)
     assert_equal(@cls[], a.repeated_combination(-1).to_a)
-    assert_equal("abcde".each_char.to_a.repeated_combination(5).map{|a|a.sort}.sort,
-                 "edcba".each_char.to_a.repeated_combination(5).map{|a|a.sort}.sort)
+    assert_equal("abcde".each_char.to_a.repeated_combination(5).map{|e|e.sort}.sort,
+                 "edcba".each_char.to_a.repeated_combination(5).map{|e|e.sort}.sort)
     assert_equal(@cls[].repeated_combination(0).to_a, @cls[[]])
     assert_equal(@cls[].repeated_combination(1).to_a, @cls[])
 

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r42068-42069


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/