From 14f8a086d831ae710a16579abf73802782eeb1f5 Mon Sep 17 00:00:00 2001 From: Douglas Eichelberger Date: Thu, 11 Jan 2024 20:04:14 -0800 Subject: [PATCH] brew vendor-gems: commit updates. --- Library/Homebrew/extend/hash/deep_merge.rb | 4 +- .../extend/hash/deep_transform_values.rb | 49 +++++++++---------- 2 files changed, 24 insertions(+), 29 deletions(-) diff --git a/Library/Homebrew/extend/hash/deep_merge.rb b/Library/Homebrew/extend/hash/deep_merge.rb index 01ecbe9260..9804d6d1e3 100644 --- a/Library/Homebrew/extend/hash/deep_merge.rb +++ b/Library/Homebrew/extend/hash/deep_merge.rb @@ -16,9 +16,7 @@ class Hash # h2 = { b: 250, c: { c1: 200 } } # h1.deep_merge(h2) { |key, this_val, other_val| this_val + other_val } # # => { a: 100, b: 450, c: { c1: 300 } } - def deep_merge(other_hash, &block) - dup.deep_merge!(other_hash, &block) - end + def deep_merge(other_hash, &block) = dup.deep_merge!(other_hash, &block) # Same as +deep_merge+, but modifies +self+. def deep_merge!(other_hash, &block) diff --git a/Library/Homebrew/extend/hash/deep_transform_values.rb b/Library/Homebrew/extend/hash/deep_transform_values.rb index c3dd789d25..24c91f15aa 100644 --- a/Library/Homebrew/extend/hash/deep_transform_values.rb +++ b/Library/Homebrew/extend/hash/deep_transform_values.rb @@ -10,38 +10,35 @@ class Hash # # hash.deep_transform_values{ |value| value.to_s.upcase } # # => {person: {name: "ROB", age: "28"}} - def deep_transform_values(&block) - _deep_transform_values_in_object(self, &block) - end + def deep_transform_values(&block) = _deep_transform_values_in_object(self, &block) # Destructively converts all values by using the block operation. # This includes the values from the root hash and from all # nested hashes and arrays. - def deep_transform_values!(&block) - _deep_transform_values_in_object!(self, &block) - end + def deep_transform_values!(&block) = _deep_transform_values_in_object!(self, &block) private - # Support methods for deep transforming nested hashes and arrays. - def _deep_transform_values_in_object(object, &block) - case object - when Hash - object.transform_values { |value| _deep_transform_values_in_object(value, &block) } - when Array - object.map { |e| _deep_transform_values_in_object(e, &block) } - else - yield(object) - end - end - def _deep_transform_values_in_object!(object, &block) - case object - when Hash - object.transform_values! { |value| _deep_transform_values_in_object!(value, &block) } - when Array - object.map! { |e| _deep_transform_values_in_object!(e, &block) } - else - yield(object) - end + # Support methods for deep transforming nested hashes and arrays. + def _deep_transform_values_in_object(object, &block) + case object + when Hash + object.transform_values { |value| _deep_transform_values_in_object(value, &block) } + when Array + object.map { |e| _deep_transform_values_in_object(e, &block) } + else + yield(object) end + end + + def _deep_transform_values_in_object!(object, &block) + case object + when Hash + object.transform_values! { |value| _deep_transform_values_in_object!(value, &block) } + when Array + object.map! { |e| _deep_transform_values_in_object!(e, &block) } + else + yield(object) + end + end end