Avoid using block_given in the presence of aliases

headius · marcandre · commit 4c38fe612ed4 · 2022-03-31T17:16:34.000+02:00
defined?(yield) bypasses the block_given? method (or any aliases
to it) and always does the right thing.
diff --git a/lib/ostruct.rb b/lib/ostruct.rb
@@ -197,7 +197,7 @@ def to_h(&block)
   #   data.each_pair.to_a   # => [[:country, "Australia"], [:capital, "Canberra"]]
   #
   def each_pair
-    return to_enum(__method__) { @table.size } unless block_given!
+    return to_enum(__method__) { @table.size } unless defined?(yield)
     @table.each_pair{|p| yield p}
     self
   end

Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ def to_h(&block)`
`197`	`197`	`# data.each_pair.to_a # => [[:country, "Australia"], [:capital, "Canberra"]]`
`198`	`198`	`#`
`199`	`199`	`def each_pair`
`200`		`- return to_enum(__method__) { @table.size } unless block_given!`
	`200`	`+ return to_enum(__method__) { @table.size } unless defined?(yield)`
`201`	`201`	`@table.each_pair{\|p\| yield p}`
`202`	`202`	`self`
`203`	`203`	`end`