diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/TransitiveBaseTraversalFunction.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/TransitiveBaseTraversalFunction.java | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveBaseTraversalFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveBaseTraversalFunction.java index e438d917d4..7215ffef01 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveBaseTraversalFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveBaseTraversalFunction.java @@ -43,7 +43,6 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import javax.annotation.Nullable; @@ -84,7 +83,7 @@ abstract class TransitiveBaseTraversalFunction<TProcessedTargets> implements Sky TProcessedTargets processedTargets, EventHandler eventHandler, TargetAndErrorIfAny targetAndErrorIfAny, - Iterable<Entry<SkyKey, ValueOrException2<NoSuchPackageException, NoSuchTargetException>>> + Iterable<Map.Entry<SkyKey, ValueOrException2<NoSuchPackageException, NoSuchTargetException>>> depEntries) throws InterruptedException; @@ -140,9 +139,11 @@ abstract class TransitiveBaseTraversalFunction<TProcessedTargets> implements Sky // made to skyframe for building this node was for the corresponding PackageValue. Iterable<SkyKey> labelAspectKeys = getStrictLabelAspectDepKeys(env, depMap, targetAndErrorIfAny); - Set<Entry<SkyKey, ValueOrException2<NoSuchPackageException, NoSuchTargetException>>> - labelAspectEntries = env.getValuesOrThrow(labelAspectKeys, NoSuchPackageException.class, - NoSuchTargetException.class).entrySet(); + Set<Map.Entry<SkyKey, ValueOrException2<NoSuchPackageException, NoSuchTargetException>>> + labelAspectEntries = + env.getValuesOrThrow( + labelAspectKeys, NoSuchPackageException.class, NoSuchTargetException.class) + .entrySet(); if (env.valuesMissing()) { return null; } @@ -188,14 +189,14 @@ abstract class TransitiveBaseTraversalFunction<TProcessedTargets> implements Sky if (target instanceof Rule) { Map<Label, ValueOrException2<NoSuchPackageException, NoSuchTargetException>> labelDepMap = new HashMap<>(depMap.size()); - for (Entry<SkyKey, ValueOrException2<NoSuchPackageException, NoSuchTargetException>> entry : - depMap.entrySet()) { + for (Map.Entry<SkyKey, ValueOrException2<NoSuchPackageException, NoSuchTargetException>> + entry : depMap.entrySet()) { labelDepMap.put(argumentFromKey(entry.getKey()), entry.getValue()); } Multimap<Attribute, Label> transitions = ((Rule) target).getTransitions(DependencyFilter.NO_NODEP_ATTRIBUTES); - for (Entry<Attribute, Label> entry : transitions.entries()) { + for (Map.Entry<Attribute, Label> entry : transitions.entries()) { ValueOrException2<NoSuchPackageException, NoSuchTargetException> value = labelDepMap.get(entry.getValue()); for (Label label : |