From 6ec361aa12fc0a1069ae39b0f479cd732b208363 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Thu, 25 Oct 2012 15:45:42 -0500 Subject: ComparableSet#merge returns self Set#merge is supposed to return self, and Formula#recursive_requirements depended on this being true. Signed-off-by: Jack Nagel --- Library/Homebrew/extend/set.rb | 1 + Library/Homebrew/test/test_comparableset.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'Library') diff --git a/Library/Homebrew/extend/set.rb b/Library/Homebrew/extend/set.rb index b45b85de9..e67a05792 100644 --- a/Library/Homebrew/extend/set.rb +++ b/Library/Homebrew/extend/set.rb @@ -20,5 +20,6 @@ class ComparableSet < Set def merge enum enum.is_a?(Enumerable) or raise ArgumentError, "value must be enumerable" enum.each { |o| add(o) } + self end end diff --git a/Library/Homebrew/test/test_comparableset.rb b/Library/Homebrew/test/test_comparableset.rb index 39f9b6f32..002f7522e 100644 --- a/Library/Homebrew/test/test_comparableset.rb +++ b/Library/Homebrew/test/test_comparableset.rb @@ -33,7 +33,7 @@ class ComparableSetTests < Test::Unit::TestCase @set << X11Dependency.new @set << Requirement.new reqs = Set.new [X11Dependency.new('2.6'), Requirement.new] - @set.merge reqs + assert_same @set, @set.merge(reqs) assert_equal @set.count, 2 assert_equal @set.find {|r| r.is_a? X11Dependency}, X11Dependency.new('2.6') -- cgit v1.2.3