aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorMike McQuaid2016-09-11 17:47:04 +0100
committerMike McQuaid2016-09-11 19:13:00 +0100
commit1f2abbdd6e960399b50f35e3e34261d13b9cf893 (patch)
tree3e0693e12e99f1f3e2c2c8142e98ae1c3f60fb15 /Library
parent6cfb84152464097901a9b9a437b37cc8c5aeb45c (diff)
downloadbrew-1f2abbdd6e960399b50f35e3e34261d13b9cf893.tar.bz2
utils/hash: fix Rubocop warnings.
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/utils/hash.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/Library/Homebrew/utils/hash.rb b/Library/Homebrew/utils/hash.rb
index 63dd02c1a..2281ce311 100644
--- a/Library/Homebrew/utils/hash.rb
+++ b/Library/Homebrew/utils/hash.rb
@@ -1,6 +1,6 @@
def deep_merge_hashes(hash1, hash2)
- merger = proc do |key, v1, v2|
- if Hash === v1 && Hash === v2
+ merger = proc do |_key, v1, v2|
+ if v1.is_a?(Hash) && v2.is_a?(Hash)
v1.merge v2, &merger
else
v2