From 7c83e3ffe38cdeb3287b275b202e2a1cdaab5bf8 Mon Sep 17 00:00:00 2001
From: Jack Nagel <jacknagel@gmail.com>
Date: Fri, 19 Jun 2015 22:30:13 -0400
Subject: [PATCH] Remove workarounds for destructuring single-element hashes
---
Library/Homebrew/compilers.rb | 2 +-
Library/Homebrew/dependency_collector.rb | 10 +---------
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/Library/Homebrew/compilers.rb b/Library/Homebrew/compilers.rb
index 25f09843e4..a8bc945c28 100644
--- a/Library/Homebrew/compilers.rb
+++ b/Library/Homebrew/compilers.rb
@@ -32,7 +32,7 @@ class CompilerFailure
def self.create(spec, &block)
# Non-Apple compilers are in the format fails_with compiler => version
if spec.is_a?(Hash)
- _, major_version = spec.each { |e| break e }
+ _, major_version = spec.first
name = "gcc-#{major_version}"
# so fails_with :gcc => '4.8' simply marks all 4.8 releases incompatible
version = "#{major_version}.999"
diff --git a/Library/Homebrew/dependency_collector.rb b/Library/Homebrew/dependency_collector.rb
index c9ccde7b9e..5c62f26281 100644
--- a/Library/Homebrew/dependency_collector.rb
+++ b/Library/Homebrew/dependency_collector.rb
@@ -57,20 +57,12 @@ class DependencyCollector
end
def build(spec)
- spec, tags = case spec
- when Hash then destructure_spec_hash(spec)
- else spec
- end
-
+ spec, tags = Hash === spec ? spec.first : spec
parse_spec(spec, Array(tags))
end
private
- def destructure_spec_hash(spec)
- spec.each { |o| return o }
- end
-
def parse_spec(spec, tags)
case spec
when String
--
GitLab