archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 17:43:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merge revision(s) r42176:

Browse source 
fix warning: shadowing outer local variable - path

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45048 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2014-02-19 15:46:49 +00:00
parent b4fa32f3f3
commit aeecc27f84
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
test/ruby/test_require.rb
View file

@ -74,12 +74,12 @@ class TestRequire < Test::Unit::TestCase
assert_separately(%w[--disable=gems], <<-INPUT) assert_separately(%w[--disable=gems], <<-INPUT)
# leave paths for require encoding objects # leave paths for require encoding objects
bug = "#{bug8165} require #{encoding} path" bug = "#{bug8165} require #{encoding} path"
path = "#{require_path}" require_path = "#{require_path}"
enc_path = Regexp.new(Regexp.escape(RUBY_PLATFORM)) enc_path = Regexp.new(Regexp.escape(RUBY_PLATFORM))
$:.replace([IO::NULL] + $:.reject {|path| enc_path !~ path}) $:.replace([IO::NULL] + $:.reject {|path| enc_path !~ path})
assert_nothing_raised(LoadError, bug) { assert_nothing_raised(LoadError, bug) {
assert(require(path), bug) assert(require(require_path), bug)
assert(!require(path), bug) assert(!require(require_path), bug)
} }
INPUT INPUT
} }

6
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.0.0" #define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2014-02-19" #define RUBY_RELEASE_DATE "2014-02-20"
#define RUBY_PATCHLEVEL 436 #define RUBY_PATCHLEVEL 437
#define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 2 #define RUBY_RELEASE_MONTH 2
#define RUBY_RELEASE_DAY 19 #define RUBY_RELEASE_DAY 20
#include "ruby/version.h" #include "ruby/version.h"