aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/collect/nestedset/NestedSet.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/collect/nestedset/NestedSet.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/collect/nestedset/NestedSet.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/collect/nestedset/NestedSet.java b/src/main/java/com/google/devtools/build/lib/collect/nestedset/NestedSet.java
index ab24d0a155..74e01eeeca 100644
--- a/src/main/java/com/google/devtools/build/lib/collect/nestedset/NestedSet.java
+++ b/src/main/java/com/google/devtools/build/lib/collect/nestedset/NestedSet.java
@@ -13,11 +13,11 @@
// limitations under the License.
package com.google.devtools.build.lib.collect.nestedset;
+import static java.util.stream.Collectors.joining;
+
import com.google.common.base.Function;
-import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
import com.google.devtools.build.lib.collect.CompactHashSet;
import java.util.AbstractCollection;
import java.util.Arrays;
@@ -26,6 +26,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Objects;
import java.util.Set;
+import java.util.stream.Stream;
import javax.annotation.Nullable;
/**
@@ -245,8 +246,9 @@ public final class NestedSet<E> implements Iterable<E> {
// TODO: this leaves LINK_ORDER backwards
private static String childrenToString(Object children) {
if (children instanceof Object[]) {
- return "{" + Joiner.on(", ").join(Iterables.transform(
- Arrays.asList((Object[]) children), Stringer.INSTANCE)) + "}";
+ return "{"
+ + Stream.of((Object[]) children).map(Stringer.INSTANCE).collect(joining(", "))
+ + "}";
} else {
return children.toString();
}