Refactor implementation of Iterator::ChainIterator

spec/std/iterator_spec.cr

@@ -165,6 +165,11 @@ describe Iterator do
       iter.next.should be_a(Iterator::Stop)
     end
 
+    # NOTE: This spec would only fail in release mode.
+    it "does not experience tuple upcase bug of #13411" do
+      [{true}].each.chain([{1}].each).first(3).to_a.should eq [{true}, {1}]
+    end
+
     describe "chain indeterminate number of iterators" do
       it "chains all together" do
         iters = [[0], [1], [2, 3], [4, 5, 6]].each.map &.each

src/iterator.cr

@@ -277,16 +277,15 @@ module Iterator(T)
     end
 
     def next
-      if @iterator1_consumed
-        @iterator2.next
-      else
+      unless @iterator1_consumed
         value = @iterator1.next
         if value.is_a?(Stop)
           @iterator1_consumed = true
-          value = @iterator2.next
+        else
+          return value
         end
-        value
       end
+      @iterator2.next
     end
   end