commit 527cef4f30bf56de4ba805d359ee0cb78d9fe234
author ulfjack <ulfjack@google.com> Mon Jan 13 01:29:21 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Mon Jan 13 01:30:09 2020 -0800
tree 5e66fd2ab5f402098e9c828723bbf8c4495782ba
parent fcb4235eae47de2a664401c9e7db67180d62d92e

Infrastructure: Use NestedSet where applicable

This is in preparation for making NestedSet not implement Iterable.

PiperOrigin-RevId: 289396295

src/main/java/com/google/devtools/build/lib/analysis/AnalysisFailureEvent.java

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/AnalysisFailureEvent.java b/src/main/java/com/google/devtools/build/lib/analysis/AnalysisFailureEvent.java
index 99739e0..e34beea 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/AnalysisFailureEvent.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/AnalysisFailureEvent.java
@@ -25,6 +25,7 @@
 import com.google.devtools.build.lib.buildeventstream.NullConfiguration;
 import com.google.devtools.build.lib.causes.Cause;
 import com.google.devtools.build.lib.cmdline.Label;
+import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.skyframe.ConfiguredTargetKey;
 import java.util.Collection;
 import javax.annotation.Nullable;
@@ -36,10 +37,10 @@
 public class AnalysisFailureEvent implements BuildEvent {
   private final ConfiguredTargetKey failedTarget;
   private final BuildEventId configuration;
-  private final Iterable<Cause> rootCauses;
+  private final NestedSet<Cause> rootCauses;
 
   public AnalysisFailureEvent(
-      ConfiguredTargetKey failedTarget, BuildEventId configuration, Iterable<Cause> rootCauses) {
+      ConfiguredTargetKey failedTarget, BuildEventId configuration, NestedSet<Cause> rootCauses) {
     this.failedTarget = failedTarget;
     if (configuration != null) {
       this.configuration = configuration;
@@ -62,13 +63,13 @@
    * Returns the label of a single root cause. Use {@link #getRootCauses} to report all root causes.
    */
   @Nullable public Label getLegacyFailureReason() {
-    if (!rootCauses.iterator().hasNext()) {
+    if (rootCauses.isEmpty()) {
       return null;
     }
-    return rootCauses.iterator().next().getLabel();
+    return rootCauses.toList().get(0).getLabel();
   }
 
-  public Iterable<Cause> getRootCauses() {
+  public NestedSet<Cause> getRootCauses() {
     return rootCauses;
   }
 
@@ -79,7 +80,7 @@
 
   @Override
   public Collection<BuildEventId> getChildrenEvents() {
-    return ImmutableList.copyOf(Iterables.transform(rootCauses, BuildEventId::fromCause));
+    return ImmutableList.copyOf(Iterables.transform(rootCauses.toList(), BuildEventId::fromCause));
   }
 
   @Override