diff options
| author | Jeremy Evans <[email protected]> | 2019-08-15 15:21:55 -0700 |
|---|---|---|
| committer | Hiroshi SHIBATA <[email protected]> | 2019-10-26 09:25:06 +0900 |
| commit | d00551a7bb1d5dbabb0a8c95d6bd2d9d4e86934a (patch) | |
| tree | b854d144bee1428eff5ad4a2a81e86adfd2142d1 /lib/forwardable.rb | |
| parent | b15e0983f7504c4688afce0ee29a2f4746b6631a (diff) | |
[ruby/forwardable] Make def_{instance,single}_delegators skip :__send__ and :__id__
Previously, __send__ and __id__ were skipped if provided as strings,
but not skipped if provided as symbols.
Fixes Ruby Bug 8855.
https://github.com/ruby/forwardable/commit/2e61c8c66c
Diffstat (limited to 'lib/forwardable.rb')
| -rw-r--r-- | lib/forwardable.rb | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/forwardable.rb b/lib/forwardable.rb index 7f219235d0..3ca8a252dd 100644 --- a/lib/forwardable.rb +++ b/lib/forwardable.rb @@ -149,9 +149,8 @@ module Forwardable # def_delegator :@records, :map # def def_instance_delegators(accessor, *methods) - methods.delete("__send__") - methods.delete("__id__") - for method in methods + methods.each do |method| + next if method.to_s == "__send__" || method.to_s == "__id__" def_instance_delegator(accessor, method) end end @@ -286,9 +285,8 @@ module SingleForwardable # def_delegator :@records, :map # def def_single_delegators(accessor, *methods) - methods.delete("__send__") - methods.delete("__id__") - for method in methods + methods.each do |method| + next if method.to_s == "__send__" || method.to_s == "__id__" def_single_delegator(accessor, method) end end |