non_mutating_set_merge_method.2.diff - Ruby master - Ruby Issue Tracking System

Feature #11710 » non_mutating_set_merge_method.2.diff

tiegz (Tieg Zaharia), 11/18/2015 07:28 PM

         if block
           do_with_enum(enum) { |o| add(block[o]) }
         else
           merge(enum)
           merge!(enum)
         end
       end
-...
         else
           do_with_enum(enum)  # make sure enum is enumerable before calling clear
           clear
           merge(enum)
           merge!(enum)
         end
       end
-...
         self if size != n
       end
       def merge(enum)
         dup.merge!(enum)
       end
       # Merges the elements of the given enumerable object to the set and
       # returns self.
       def merge(enum)
       def merge!(enum)
         if enum.instance_of?(self.class)
           @hash.update(enum.instance_variable_get(:@hash))
         else
-...
       # Returns a new set built by merging the set and the elements of the
       # given enumerable object.
       def |(enum)
         dup.merge(enum)
         merge(enum)
       end
       alias + |             ##
       alias union |         ##

         set = Set[1,2,3]
         ret = set.merge([2,4,6])
         assert_not_same(set, ret)
         assert_equal(Set[1,2,3,4,6], ret)
       end
      def test_merge!
         set = Set[1,2,3]
         ret = set.merge!([2,4,6])
         assert_same(set, ret)
         assert_equal(Set[1,2,3,4,6], set)
       end

(2-2/2)