From 71190e2fa4977c8916b196815374cc166a8b4608 Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Mon, 8 Jun 2020 12:05:46 -0700 Subject: [PATCH 1/2] Fix `IterableForIterator` to accept `? extends T` --- .../java/com/fizzed/rocker/runtime/IterableForIterator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rocker-runtime/src/main/java/com/fizzed/rocker/runtime/IterableForIterator.java b/rocker-runtime/src/main/java/com/fizzed/rocker/runtime/IterableForIterator.java index b1cc0acc..551f57ff 100644 --- a/rocker-runtime/src/main/java/com/fizzed/rocker/runtime/IterableForIterator.java +++ b/rocker-runtime/src/main/java/com/fizzed/rocker/runtime/IterableForIterator.java @@ -25,10 +25,10 @@ */ public class IterableForIterator implements ForIterator { - private final Iterator iterator; + private final Iterator iterator; private int index; - public IterableForIterator(Iterable c) { + public IterableForIterator(Iterable c) { this(c.iterator()); } From d47f1a574215ef92015a2bb321dd862da9eed85c Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Thu, 11 Jun 2020 10:08:36 -0700 Subject: [PATCH 2/2] Missed a `` spot. --- .../java/com/fizzed/rocker/runtime/IterableForIterator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rocker-runtime/src/main/java/com/fizzed/rocker/runtime/IterableForIterator.java b/rocker-runtime/src/main/java/com/fizzed/rocker/runtime/IterableForIterator.java index 551f57ff..d4f06307 100644 --- a/rocker-runtime/src/main/java/com/fizzed/rocker/runtime/IterableForIterator.java +++ b/rocker-runtime/src/main/java/com/fizzed/rocker/runtime/IterableForIterator.java @@ -68,7 +68,7 @@ public IterableForIterator(double[] a) { this((Iterable) new PrimitiveCollections.DoubleCollection(a)); } - public IterableForIterator(Iterator iterator) { + public IterableForIterator(Iterator iterator) { this.iterator = iterator; this.index = -1; }