From 7104e20bde71a72a99497c8148ebeb10cf97dfde Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Wed, 13 Mar 2013 02:07:01 -0500 Subject: [PATCH] Replace custom collection with Set The original constraints that led to using a custom collection rather than Array or Set here no longer exist, so let's avoid the pointless abstraction here. --- Library/Homebrew/compilers.rb | 23 ----------------------- Library/Homebrew/formula.rb | 8 ++------ 2 files changed, 2 insertions(+), 29 deletions(-) diff --git a/Library/Homebrew/compilers.rb b/Library/Homebrew/compilers.rb index f9ed8bcde0..b4fbef99c1 100644 --- a/Library/Homebrew/compilers.rb +++ b/Library/Homebrew/compilers.rb @@ -21,29 +21,6 @@ class Compilers end -class CompilerFailures - include Enumerable - - def initialize(*args) - @failures = Array.new(*args) - end - - def each(*args, &block) - @failures.each(*args, &block) - end - - def include?(cc) - cc = Compiler.new(cc) unless cc.is_a? Compiler - @failures.any? { |failure| failure.compiler == cc.name } - end - - def <<(o) - @failures << o unless include? o.compiler - self - end -end - - class Compiler attr_reader :name, :build diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index 9234b45df5..7ba0cd01e0 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -785,12 +785,8 @@ private end def fails_with compiler, &block - @cc_failures ||= CompilerFailures.new - @cc_failures << if block_given? - CompilerFailure.new(compiler, &block) - else - CompilerFailure.new(compiler) - end + @cc_failures ||= Set.new + @cc_failures << CompilerFailure.new(compiler, &block) end def test &block