[前][次][番号順一覧][スレッド一覧]

ruby-changes:65886

From: nagachika <ko1@a...>
Date: Sun, 18 Apr 2021 18:06:23 +0900 (JST)
Subject: [ruby-changes:65886] 6e6157d9a9 (ruby_3_0): merge revision(s) 6268fdc662c75c61091b2ab0b476ec15df023328:

https://git.ruby-lang.org/ruby.git/commit/?id=6e6157d9a9

From 6e6157d9a985dd39a141e26e579b8508f6ceff15 Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@r...>
Date: Sun, 18 Apr 2021 17:59:19 +0900
Subject: merge revision(s) 6268fdc662c75c61091b2ab0b476ec15df023328:

	spec/ruby/core/hash/transform_keys_spec.rb: Fix the failure of
	 ruby_3_0

	https://github.com/ruby/spec/pull/833
	https://github.com/ruby/spec/commit/8290e5ad8952b14ee9a5069651d9864c66681112
	---
	 spec/ruby/core/hash/transform_keys_spec.rb | 4 ++--
	 1 file changed, 2 insertions(+), 2 deletions(-)
---
 spec/ruby/core/hash/transform_keys_spec.rb | 4 ++--
 version.h                                  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/spec/ruby/core/hash/transform_keys_spec.rb b/spec/ruby/core/hash/transform_keys_spec.rb
index 55aec39..a7ea80d 100644
--- a/spec/ruby/core/hash/transform_keys_spec.rb
+++ b/spec/ruby/core/hash/transform_keys_spec.rb
@@ -84,7 +84,7 @@ describe "Hash#transform_keys!" do https://github.com/ruby/ruby/blob/trunk/spec/ruby/core/hash/transform_keys_spec.rb#L84
     end
   end
 
-  ruby_version_is "2.5.1"..."3.0" do
+  ruby_version_is "2.5.1"..."3.0.2" do
     it "returns the processed keys if we broke from the block" do
       @hash.transform_keys! do |v|
         break if v == :c
@@ -94,7 +94,7 @@ describe "Hash#transform_keys!" do https://github.com/ruby/ruby/blob/trunk/spec/ruby/core/hash/transform_keys_spec.rb#L94
     end
   end
 
-  ruby_version_is "3.0" do
+  ruby_version_is "3.0.2" do
     it "returns the processed keys and non evaluated keys if we broke from the block" do
       @hash.transform_keys! do |v|
         break if v == :c
diff --git a/version.h b/version.h
index ff6e0aa..345dafb 100644
--- a/version.h
+++ b/version.h
@@ -12,11 +12,11 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L12
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 2
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 68
+#define RUBY_PATCHLEVEL 69
 
 #define RUBY_RELEASE_YEAR 2021
 #define RUBY_RELEASE_MONTH 4
-#define RUBY_RELEASE_DAY 15
+#define RUBY_RELEASE_DAY 18
 
 #include "ruby/version.h"
 
-- 
cgit v1.1


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

[前][次][番号順一覧][スレッド一覧]