diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-27 16:55:20 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-27 16:55:20 +0000 |
commit | 7f04247e6db5eaad447c8cc04332058fbd228973 (patch) | |
tree | 04d77d1aa30a00be4e2c1e3a8966aa50d12ae534 | |
parent | 65639d44e962419bc1da1f1dfbec232abcced6cd (diff) |
merge revision(s) 57515: [Backport #13169]
lib/ostruct.rb: Fix returned value of each_pair.
From a patch by Marcus Stollsteimer. [Fixes #13169]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@58178 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | lib/ostruct.rb | 1 | ||||
-rw-r--r-- | test/ostruct/test_ostruct.rb | 1 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/lib/ostruct.rb b/lib/ostruct.rb index bae0f3aac5..d2375a2572 100644 --- a/lib/ostruct.rb +++ b/lib/ostruct.rb @@ -134,6 +134,7 @@ class OpenStruct def each_pair return to_enum(__method__) { @table.size } unless block_given? @table.each_pair{|p| yield p} + self end # diff --git a/test/ostruct/test_ostruct.rb b/test/ostruct/test_ostruct.rb index 0504efbf76..c4cb0c289c 100644 --- a/test/ostruct/test_ostruct.rb +++ b/test/ostruct/test_ostruct.rb @@ -140,6 +140,7 @@ class TC_OpenStruct < Test::Unit::TestCase def test_each_pair h = {name: "John Smith", age: 70, pension: 300} os = OpenStruct.new(h) + assert_same os, os.each_pair{ } assert_equal '#<Enumerator: #<OpenStruct name="John Smith", age=70, pension=300>:each_pair>', os.each_pair.inspect assert_equal [[:name, "John Smith"], [:age, 70], [:pension, 300]], os.each_pair.to_a assert_equal 3, os.each_pair.size @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.3.3" #define RUBY_RELEASE_DATE "2017-03-28" -#define RUBY_PATCHLEVEL 287 +#define RUBY_PATCHLEVEL 288 #define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_MONTH 3 |