From c13d7e6723bb7ccdb3ae9e768b6a1ac58978aead Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Tue, 16 Feb 2021 09:25:34 +0000 Subject: [PATCH] Fix brew style --- Library/Homebrew/descriptions.rb | 2 +- Library/Homebrew/extend/os/mac/software_spec.rb | 2 +- Library/Homebrew/software_spec.rb | 2 +- Library/Homebrew/utils/spdx.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/descriptions.rb b/Library/Homebrew/descriptions.rb index 8f980de1c6..ef5b33f852 100644 --- a/Library/Homebrew/descriptions.rb +++ b/Library/Homebrew/descriptions.rb @@ -52,7 +52,7 @@ class Descriptions private def short_names - @short_names ||= Hash[@descriptions.keys.map { |k| [k, k.split("/").last] }] + @short_names ||= @descriptions.keys.map { |k| [k, k.split("/").last] }.to_h end def short_name_counts diff --git a/Library/Homebrew/extend/os/mac/software_spec.rb b/Library/Homebrew/extend/os/mac/software_spec.rb index 221c0c4ca6..43c2efc4cc 100644 --- a/Library/Homebrew/extend/os/mac/software_spec.rb +++ b/Library/Homebrew/extend/os/mac/software_spec.rb @@ -9,7 +9,7 @@ class SoftwareSpec if deps.is_a?(Hash) bounds = deps.dup - deps = Hash[*bounds.shift] + deps = bounds.shift end bounds = bounds.transform_values { |v| MacOS::Version.from_symbol(v) } diff --git a/Library/Homebrew/software_spec.rb b/Library/Homebrew/software_spec.rb index 7ea09450bf..491eef049c 100644 --- a/Library/Homebrew/software_spec.rb +++ b/Library/Homebrew/software_spec.rb @@ -178,7 +178,7 @@ class SoftwareSpec end def uses_from_macos(spec, _bounds = {}) - spec = Hash[*spec.first] if spec.is_a?(Hash) + spec = spec.dup.shift if spec.is_a?(Hash) depends_on(spec) end diff --git a/Library/Homebrew/utils/spdx.rb b/Library/Homebrew/utils/spdx.rb index 1fe89ae6fa..86290b4b60 100644 --- a/Library/Homebrew/utils/spdx.rb +++ b/Library/Homebrew/utils/spdx.rb @@ -110,7 +110,7 @@ module SPDX else bracket = false license_expression.each do |expression| - expressions.push license_expression_to_string(Hash[*expression], bracket: true) + expressions.push license_expression_to_string([expression].to_h, bracket: true) end end