From cffffaa33a22fcb8abb0d98cd6fce1e1be6cdb73 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Fri, 17 Jun 2016 21:58:24 +0100
Subject: Fix ambiguous method references

---
 src/main/java/org/zwobble/mammoth/internal/util/Iterables.java | 2 +-
 src/main/java/org/zwobble/mammoth/internal/util/Lists.java     | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/main/java/org/zwobble/mammoth/internal/util')

diff --git a/src/main/java/org/zwobble/mammoth/internal/util/Iterables.java b/src/main/java/org/zwobble/mammoth/internal/util/Iterables.java
index 7297894..04a987a 100644
--- a/src/main/java/org/zwobble/mammoth/internal/util/Iterables.java
+++ b/src/main/java/org/zwobble/mammoth/internal/util/Iterables.java
@@ -27,7 +27,7 @@ public class Iterables {
         };
     }
 
-    public static <T, R> Iterable<R> lazyMap(Iterable<T> iterable, BiFunction<Integer, T, R> function) {
+    public static <T, R> Iterable<R> lazyMapWithIndex(Iterable<T> iterable, BiFunction<Integer, T, R> function) {
         return new Iterable<R>() {
             @Override
             public Iterator<R> iterator() {
diff --git a/src/main/java/org/zwobble/mammoth/internal/util/Lists.java b/src/main/java/org/zwobble/mammoth/internal/util/Lists.java
index f918716..0fb53c1 100644
--- a/src/main/java/org/zwobble/mammoth/internal/util/Lists.java
+++ b/src/main/java/org/zwobble/mammoth/internal/util/Lists.java
@@ -8,7 +8,6 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import static java.util.Arrays.asList;
-import static org.zwobble.mammoth.internal.util.Iterables.lazyMap;
 import static org.zwobble.mammoth.internal.util.Iterables.stream;
 
 public class Lists {
@@ -49,8 +48,8 @@ public class Lists {
         return stream(iterable).map(function).collect(Collectors.toList());
     }
 
-    public static <T, R> List<R> eagerMap(Iterable<T> iterable, BiFunction<Integer, T, R> function) {
-        return toList(lazyMap(iterable, function));
+    public static <T, R> List<R> eagerMapWithIndex(Iterable<T> iterable, BiFunction<Integer, T, R> function) {
+        return toList(Iterables.lazyMapWithIndex(iterable, function));
     }
 
     public static <T, R> List<R> eagerFlatMap(Iterable<T> iterable, Function<T, Iterable<R>> function) {
-- 
cgit v1.2.3