ruby-changes:65797
From: nagachika <ko1@a...>
Date: Mon, 5 Apr 2021 21:42:00 +0900 (JST)
Subject: [ruby-changes:65797] 6847ee089d (ruby_2_7): merge revision(s) 856a9701fd13edbb9d5f0fa773082d312195df90:
https://git.ruby-lang.org/ruby.git/commit/?id=6847ee089d From 6847ee089d7655b2a0eea4fee3133aeacd4cc7cc Mon Sep 17 00:00:00 2001 From: nagachika <nagachika@r...> Date: Mon, 5 Apr 2021 21:39:38 +0900 Subject: merge revision(s) 856a9701fd13edbb9d5f0fa773082d312195df90: Get rid of multibyte prefix to tmpdir --- test/ruby/test_require.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) --- test/ruby/test_require.rb | 12 ++++++------ version.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/ruby/test_require.rb b/test/ruby/test_require.rb index a86ea35..4e7573b 100644 --- a/test/ruby/test_require.rb +++ b/test/ruby/test_require.rb @@ -368,15 +368,15 @@ class TestRequire < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/ruby/test_require.rb#L368 bug = '[ruby-list:49994] path in ospath' base = "test_load\u{3042 3044 3046 3048 304a}".encode(Encoding::Windows_31J) path = nil - Tempfile.create([base, ".rb"]) do |t| - path = t.path - + Dir.mktmpdir do |dir| + path = File.join(dir, base+".rb") assert_raise_with_message(LoadError, /#{base}/) { - load(File.join(File.dirname(path), base)) + load(File.join(dir, base)) } - t.puts "warn 'ok'" - t.close + File.open(path, "w+b") do |t| + t.puts "warn 'ok'" + end assert_include(path, base) assert_warn("ok\n", bug) { assert_nothing_raised(LoadError, bug) { diff --git a/version.h b/version.h index c5d337f..d14153a 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L2 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 3 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 182 +#define RUBY_PATCHLEVEL 183 #define RUBY_RELEASE_YEAR 2021 #define RUBY_RELEASE_MONTH 4 -- cgit v1.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/