aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/org/zwobble/couscous/util
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2017-03-30 22:06:49 +0100
committerMichael Williamson <mike@zwobble.org>2017-03-30 22:06:49 +0100
commit63bc7c39a52a3de9c578bbfbe42c0076f6a748c0 (patch)
tree4b346c1f7a021c2a24a783aa53703a87a91b2c56 /src/main/java/org/zwobble/couscous/util
parent412d0e3e286acde8a65df3636444e46580254e5b (diff)
Fix type parameter capture
Diffstat (limited to 'src/main/java/org/zwobble/couscous/util')
-rw-r--r--src/main/java/org/zwobble/couscous/util/ExtraLists.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/org/zwobble/couscous/util/ExtraLists.java b/src/main/java/org/zwobble/couscous/util/ExtraLists.java
index b84afcd..3c14a45 100644
--- a/src/main/java/org/zwobble/couscous/util/ExtraLists.java
+++ b/src/main/java/org/zwobble/couscous/util/ExtraLists.java
@@ -45,8 +45,8 @@ public class ExtraLists {
return ImmutableList.copyOf(Iterables.concat(first, second));
}
- public static <T> List<T> concat(List<? extends T> first, List<? extends T> second, List<? extends T> third) {
- return Stream.concat(Stream.concat(first.stream(), second.stream()), third.stream()).collect(Collectors.toList());
+ public static <T> List<T> concat(Iterable<? extends T> first, Iterable<? extends T> second, Iterable<? extends T> third) {
+ return ImmutableList.copyOf(Iterables.concat(first, second, third));
}
@SuppressWarnings("unchecked")