usa	2014-09-10 13:38:43 +0900 (Wed, 10 Sep 2014)

  New Revision: 47504

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

  Log:
    * test/ruby/envutil.rb: remove duplicated method.  this problem was introduced
      at r47479.

  Modified files:
    branches/ruby_2_0_0/test/ruby/envutil.rb
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 47503)
+++ ruby_2_0_0/version.h	(revision 47504)
@@ -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 "2014-09-10"
-#define RUBY_PATCHLEVEL 565
+#define RUBY_PATCHLEVEL 566
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 9
Index: ruby_2_0_0/test/ruby/envutil.rb
===================================================================
--- ruby_2_0_0/test/ruby/envutil.rb	(revision 47503)
+++ ruby_2_0_0/test/ruby/envutil.rb	(revision 47504)
@@ -423,26 +423,6 @@ eom https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/ruby/envutil.rb#L423
           clone.tap {|a| a.message = message}
         end
       end
-
-      # derived from MiniTest 2.1.0
-      def assert_raise_with_message(exception, expected, msg = nil, &block)
-        case expected
-        when String
-          assert = :assert_equal
-        when Regexp
-          assert = :assert_match
-        else
-          raise TypeError, "Expected #{expected.inspect} to be a kind of String or Regexp, not #{expected.class}"
-        end
-
-        ex = assert_raise(exception, *msg) { yield }
-        if assert == :assert_equal
-          assert_equal(expected, ex.message, msg || "Expected exception(#{exception}) was raised, but the message doesn't match")
-        else
-          assert(expected =~ ex.message, msg || "Expected #{expected} to match #{ex.message}")
-          block.binding.eval("proc{|_|$~=_}").call($~)
-        end
-      end
     end
   end
 end

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