nagachika	2014-02-20 00:46:49 +0900 (Thu, 20 Feb 2014)

  New Revision: 45048

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

  Log:
    merge revision(s) r42176:
    
    fix warning: shadowing outer local variable - path

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/test/ruby/test_require.rb
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 45047)
+++ ruby_2_0_0/version.h	(revision 45048)
@@ -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 "2014-02-19"
-#define RUBY_PATCHLEVEL 436
+#define RUBY_RELEASE_DATE "2014-02-20"
+#define RUBY_PATCHLEVEL 437
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 19
+#define RUBY_RELEASE_DAY 20
 
 #include "ruby/version.h"
 
Index: ruby_2_0_0/test/ruby/test_require.rb
===================================================================
--- ruby_2_0_0/test/ruby/test_require.rb	(revision 45047)
+++ ruby_2_0_0/test/ruby/test_require.rb	(revision 45048)
@@ -74,12 +74,12 @@ class TestRequire < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/ruby/test_require.rb#L74
       assert_separately(%w[--disable=gems], <<-INPUT)
         # leave paths for require encoding objects
         bug = "#{bug8165} require #{encoding} path"
-        path = "#{require_path}"
+        require_path = "#{require_path}"
         enc_path = Regexp.new(Regexp.escape(RUBY_PLATFORM))
         $:.replace([IO::NULL] + $:.reject {|path| enc_path !~ path})
         assert_nothing_raised(LoadError, bug) {
-          assert(require(path), bug)
-          assert(!require(path), bug)
+          assert(require(require_path), bug)
+          assert(!require(require_path), bug)
         }
       INPUT
     }

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r42176


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