diff options
17 files changed, 59 insertions, 62 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionFunction.java index ab9e1bd35a..77f7254639 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionFunction.java @@ -56,7 +56,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 java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicReference; @@ -116,7 +115,7 @@ public class ActionExecutionFunction implements SkyFunction, CompletionReceiver return null; } Map<String, String> clientEnv = new HashMap<>(); - for (Entry<SkyKey, SkyValue> entry : clientEnvLookup.entrySet()) { + for (Map.Entry<SkyKey, SkyValue> entry : clientEnvLookup.entrySet()) { ClientEnvironmentValue envValue = (ClientEnvironmentValue) entry.getValue(); if (envValue.getValue() != null) { clientEnv.put((String) entry.getKey().argument(), envValue.getValue()); @@ -516,7 +515,7 @@ public class ActionExecutionFunction implements SkyFunction, CompletionReceiver Map<SkyKey, SkyValue> nonMandatoryDiscovered = env.getValues(newlyDiscoveredInputsToSkyKeys(discoveredInputs, inputData.keySet())); if (!env.valuesMissing()) { - for (Entry<SkyKey, SkyValue> entry : nonMandatoryDiscovered.entrySet()) { + for (Map.Entry<SkyKey, SkyValue> entry : nonMandatoryDiscovered.entrySet()) { Artifact input = ArtifactSkyKey.artifact(entry.getKey()); if (entry.getValue() instanceof TreeArtifactValue) { TreeArtifactValue treeValue = (TreeArtifactValue) entry.getValue(); diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/DirectoryListingStateValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/DirectoryListingStateValue.java index c0503cb8cf..69f8e79a32 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/DirectoryListingStateValue.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/DirectoryListingStateValue.java @@ -19,7 +19,6 @@ import com.google.devtools.build.lib.concurrent.BlazeInterners; import com.google.devtools.build.lib.concurrent.ThreadSafety.ThreadSafe; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.vfs.Dirent; -import com.google.devtools.build.lib.vfs.Dirent.Type; import com.google.devtools.build.lib.vfs.RootedPath; import com.google.devtools.build.lib.vfs.Symlinks; import com.google.devtools.build.skyframe.AbstractSkyKey; @@ -203,13 +202,13 @@ public final class DirectoryListingStateValue implements SkyValue { boolean upper = packedTypes.get(start); boolean lower = packedTypes.get(start + 1); if (!upper && !lower) { - return Type.FILE; + return Dirent.Type.FILE; } else if (!upper && lower){ - return Type.DIRECTORY; + return Dirent.Type.DIRECTORY; } else if (upper && !lower) { - return Type.SYMLINK; + return Dirent.Type.SYMLINK; } else { - return Type.UNKNOWN; + return Dirent.Type.UNKNOWN; } } diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunction.java index 4ed96ec337..aa4fa7befb 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunction.java @@ -33,7 +33,6 @@ import com.google.devtools.build.skyframe.SkyKey; import com.google.devtools.build.skyframe.SkyValue; import java.util.LinkedHashMap; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import java.util.TreeMap; @@ -326,13 +325,15 @@ public final class FilesetEntryFunction implements SkyFunction { }); // 2. Extract the iterables of the true subdirectories. - Iterable<Iterable<ResolvedFile>> subdirIters = Iterables.transform(noDirSymlinkes, - new Function<Map.Entry<String, DirectoryTree>, Iterable<ResolvedFile>>() { - @Override - public Iterable<ResolvedFile> apply(Entry<String, DirectoryTree> input) { - return input.getValue().iterateFiles(); - } - }); + Iterable<Iterable<ResolvedFile>> subdirIters = + Iterables.transform( + noDirSymlinkes, + new Function<Map.Entry<String, DirectoryTree>, Iterable<ResolvedFile>>() { + @Override + public Iterable<ResolvedFile> apply(Map.Entry<String, DirectoryTree> input) { + return input.getValue().iterateFiles(); + } + }); // 3. Just concat all subdirectory iterations for one, seamless iteration. Iterable<ResolvedFile> dirsIter = Iterables.concat(subdirIters); diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/GlobFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/GlobFunction.java index 16846bc621..3dcb7f604f 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/GlobFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/GlobFunction.java @@ -22,7 +22,6 @@ import com.google.devtools.build.lib.cmdline.PackageIdentifier; import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.vfs.Dirent; -import com.google.devtools.build.lib.vfs.Dirent.Type; import com.google.devtools.build.lib.vfs.PathFragment; import com.google.devtools.build.lib.vfs.RootedPath; import com.google.devtools.build.lib.vfs.UnixGlob; @@ -152,7 +151,7 @@ public final class GlobFunction implements SkyFunction { Map<Dirent, Object> sortedResultMap = Maps.newTreeMap(); // First pass: do normal files and collect SkyKeys to request for subdirectories and symlinks. for (Dirent dirent : listingValue.getDirents()) { - Type direntType = dirent.getType(); + Dirent.Type direntType = dirent.getType(); String fileName = dirent.getName(); if (!UnixGlob.matches(patternHead, fileName, regexPatternCache)) { continue; diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/GraphBackedRecursivePackageProvider.java b/src/main/java/com/google/devtools/build/lib/skyframe/GraphBackedRecursivePackageProvider.java index 53325ae611..e926ffab8d 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/GraphBackedRecursivePackageProvider.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/GraphBackedRecursivePackageProvider.java @@ -30,7 +30,6 @@ import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.PackageIdentifier; import com.google.devtools.build.lib.cmdline.RepositoryName; import com.google.devtools.build.lib.cmdline.TargetPattern; -import com.google.devtools.build.lib.cmdline.TargetPattern.Type; import com.google.devtools.build.lib.concurrent.ThreadSafety.ThreadSafe; import com.google.devtools.build.lib.events.Event; import com.google.devtools.build.lib.events.ExtendedEventHandler; @@ -192,7 +191,7 @@ public final class GraphBackedRecursivePackageProvider implements RecursivePacka boolean inUniverse = false; for (TargetPatternKey patternKey : universeTargetPatternKeys) { TargetPattern pattern = patternKey.getParsedPattern(); - boolean isTBD = pattern.getType().equals(Type.TARGETS_BELOW_DIRECTORY); + boolean isTBD = pattern.getType().equals(TargetPattern.Type.TARGETS_BELOW_DIRECTORY); PackageIdentifier packageIdentifier = PackageIdentifier.create(repository, directory); if (isTBD && pattern.containsAllTransitiveSubdirectoriesForTBD(packageIdentifier)) { inUniverse = true; diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java index 443fe8b795..d3d7acf30b 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java @@ -79,7 +79,6 @@ import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; @@ -666,7 +665,7 @@ public class PackageFunction implements SkyFunction { } // Process the loaded imports. - for (Entry<String, Label> importEntry : importPathMap.entrySet()) { + for (Map.Entry<String, Label> importEntry : importPathMap.entrySet()) { String importString = importEntry.getKey(); Label importLabel = importEntry.getValue(); SkyKey keyForLabel = SkylarkImportLookupValue.key(importLabel, inWorkspace); diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternValue.java index 4a1b83062c..2c43726e2e 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternValue.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternValue.java @@ -16,6 +16,7 @@ package com.google.devtools.build.lib.skyframe; import com.google.common.collect.ImmutableList; import com.google.common.collect.Interner; import com.google.devtools.build.lib.cmdline.TargetParsingException; +import com.google.devtools.build.lib.cmdline.TargetPattern; import com.google.devtools.build.lib.cmdline.TargetPattern.Type; import com.google.devtools.build.lib.concurrent.BlazeInterners; import com.google.devtools.build.lib.concurrent.ThreadSafety.ThreadSafe; @@ -111,7 +112,10 @@ public class PrepareDepsOfPatternValue implements SkyValue { targetPatternKeysBuilder.build()); for (TargetPatternKey targetPatternKey : combinedTargetPatternKeys) { if (targetPatternKey.isNegative() - && !targetPatternKey.getParsedPattern().getType().equals(Type.TARGETS_BELOW_DIRECTORY)) { + && !targetPatternKey + .getParsedPattern() + .getType() + .equals(TargetPattern.Type.TARGETS_BELOW_DIRECTORY)) { resultExceptionsBuilder.add( new PrepareDepsOfPatternSkyKeyException( new TargetParsingException( diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ProcessPackageDirectory.java b/src/main/java/com/google/devtools/build/lib/skyframe/ProcessPackageDirectory.java index 6d1cf5a7ce..2768bde16d 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/ProcessPackageDirectory.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/ProcessPackageDirectory.java @@ -26,7 +26,6 @@ import com.google.devtools.build.lib.events.Event; import com.google.devtools.build.lib.events.EventHandler; import com.google.devtools.build.lib.packages.NoSuchPackageException; import com.google.devtools.build.lib.vfs.Dirent; -import com.google.devtools.build.lib.vfs.Dirent.Type; import com.google.devtools.build.lib.vfs.PathFragment; import com.google.devtools.build.lib.vfs.Root; import com.google.devtools.build.lib.vfs.RootedPath; @@ -174,8 +173,8 @@ public class ProcessPackageDirectory { boolean followSymlinks = shouldFollowSymlinksWhenTraversing(dirListingValue.getDirents()); List<SkyKey> childDeps = new ArrayList<>(); for (Dirent dirent : dirListingValue.getDirents()) { - Type type = dirent.getType(); - if (type != Type.DIRECTORY && (type != Type.SYMLINK || !followSymlinks)) { + Dirent.Type type = dirent.getType(); + if (type != Dirent.Type.DIRECTORY && (type != Dirent.Type.SYMLINK || !followSymlinks)) { // Non-directories can never host packages. Symlinks to non-directories are weeded out at // the next level of recursion when we check if its FileValue is a directory. This is slower // if there are a lot of symlinks in the tree, but faster if there are only a few, which is diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java index 1fa364f76b..d05b137b5f 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java @@ -172,7 +172,6 @@ import java.util.HashSet; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import java.util.UUID; import java.util.concurrent.Callable; @@ -2121,7 +2120,7 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory { LinkedHashMap<String, String> actionEnvironment = new LinkedHashMap<>(); BuildConfiguration.Options opt = options.getOptions(BuildConfiguration.Options.class); if (opt != null) { - for (Entry<String, String> v : opt.actionEnvironment) { + for (Map.Entry<String, String> v : opt.actionEnvironment) { actionEnvironment.put(v.getKey(), v.getValue()); } } diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitor.java index c61c69ff9d..66bc2ee8a3 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitor.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitor.java @@ -24,7 +24,7 @@ import com.google.devtools.build.skyframe.CyclesReporter; import com.google.devtools.build.skyframe.ErrorInfo; import com.google.devtools.build.skyframe.EvaluationResult; import com.google.devtools.build.skyframe.SkyKey; -import java.util.Map.Entry; +import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; @@ -69,7 +69,7 @@ public final class SkyframeLabelVisitor implements TransitivePackageLoader { return true; } - Set<Entry<SkyKey, ErrorInfo>> errors = result.errorMap().entrySet(); + Set<Map.Entry<SkyKey, ErrorInfo>> errors = result.errorMap().entrySet(); if (!errorOnCycles) { errors = errors @@ -85,7 +85,7 @@ public final class SkyframeLabelVisitor implements TransitivePackageLoader { // We may have multiple errors, but in non keep_going builds, we're obligated to print only // one of them. Preconditions.checkState(!errors.isEmpty(), result); - Entry<SkyKey, ErrorInfo> error = errors.iterator().next(); + Map.Entry<SkyKey, ErrorInfo> error = errors.iterator().next(); ErrorInfo errorInfo = error.getValue(); SkyKey topLevel = error.getKey(); Label topLevelLabel = ((TransitiveTargetKey) topLevel).getLabel(); @@ -102,7 +102,7 @@ public final class SkyframeLabelVisitor implements TransitivePackageLoader { return false; } - for (Entry<SkyKey, ErrorInfo> errorEntry : errors) { + for (Map.Entry<SkyKey, ErrorInfo> errorEntry : errors) { SkyKey key = errorEntry.getKey(); ErrorInfo errorInfo = errorEntry.getValue(); Preconditions.checkState(key.functionName().equals(SkyFunctions.TRANSITIVE_TARGET), errorEntry); diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunction.java index 39222904c3..93f7596723 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunction.java @@ -60,7 +60,6 @@ import com.google.devtools.build.skyframe.ValueOrException2; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.logging.Logger; import javax.annotation.Nullable; @@ -303,7 +302,7 @@ public class SkylarkImportLookupFunction implements SkyFunction { Map<String, Extension> extensionsForImports = Maps.newHashMapWithExpectedSize(imports.size()); ImmutableList.Builder<SkylarkFileDependency> fileDependencies = ImmutableList.builderWithExpectedSize(labelsForImports.size()); - for (Entry<String, Label> importEntry : labelsForImports.entrySet()) { + for (Map.Entry<String, Label> importEntry : labelsForImports.entrySet()) { String importString = importEntry.getKey(); Label importLabel = importEntry.getValue(); SkyKey keyForLabel = SkylarkImportLookupValue.key(importLabel, inWorkspace); @@ -363,9 +362,10 @@ public class SkylarkImportLookupFunction implements SkyFunction { } try { // Process lookup results. - for (Entry<SkyKey, - ValueOrException2<BuildFileNotFoundException, - InconsistentFilesystemException>> entry : lookupResults.entrySet()) { + for (Map.Entry< + SkyKey, + ValueOrException2<BuildFileNotFoundException, InconsistentFilesystemException>> + entry : lookupResults.entrySet()) { ContainingPackageLookupValue lookupValue = (ContainingPackageLookupValue) entry.getValue().get(); if (!lookupValue.hasContainingPackage()) { @@ -440,7 +440,7 @@ public class SkylarkImportLookupFunction implements SkyFunction { if (absoluteLabels == null) { return null; } - for (Entry<PathFragment, Label> entry : absoluteLabels.entrySet()) { + for (Map.Entry<PathFragment, Label> entry : absoluteLabels.entrySet()) { PathFragment currPath = entry.getKey(); Label currLabel = entry.getValue(); for (String importString : pathToImports.build().get(currPath)) { diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternValue.java index d4113e3cd1..49f80af2b4 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternValue.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternValue.java @@ -21,11 +21,9 @@ import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.LabelSyntaxException; import com.google.devtools.build.lib.cmdline.PackageIdentifier; import com.google.devtools.build.lib.cmdline.ResolvedTargets; -import com.google.devtools.build.lib.cmdline.ResolvedTargets.Builder; import com.google.devtools.build.lib.cmdline.TargetParsingException; import com.google.devtools.build.lib.cmdline.TargetPattern; import com.google.devtools.build.lib.cmdline.TargetPattern.ContainsTBDForTBDResult; -import com.google.devtools.build.lib.cmdline.TargetPattern.Type; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.concurrent.ThreadSafety.ThreadSafe; import com.google.devtools.build.lib.pkgcache.FilteringPolicies; @@ -86,7 +84,7 @@ public final class TargetPatternValue implements SkyValue { List<String> ts = (List<String>) in.readObject(); List<String> filteredTs = (List<String>) in.readObject(); - Builder<Label> builder = ResolvedTargets.<Label>builder(); + ResolvedTargets.Builder<Label> builder = ResolvedTargets.<Label>builder(); for (String labelString : ts) { builder.add(labelFromString(labelString)); } @@ -163,7 +161,10 @@ public final class TargetPatternValue implements SkyValue { for (int i = 0; i < keys.size(); i++) { TargetPatternKey targetPatternKey = keys.get(i); if (targetPatternKey.isNegative()) { - if (!targetPatternKey.getParsedPattern().getType().equals(Type.TARGETS_BELOW_DIRECTORY) + if (!targetPatternKey + .getParsedPattern() + .getType() + .equals(TargetPattern.Type.TARGETS_BELOW_DIRECTORY) || indicesOfNegativePatternsThatNeedToBeIncluded.contains(i)) { builder.add(targetPatternKey); } @@ -211,7 +212,7 @@ public final class TargetPatternValue implements SkyValue { TargetPatternKey laterTargetPatternKey = keys.get(j); TargetPattern laterParsedPattern = laterTargetPatternKey.getParsedPattern(); if (laterTargetPatternKey.isNegative() - && laterParsedPattern.getType() == Type.TARGETS_BELOW_DIRECTORY) { + && laterParsedPattern.getType() == TargetPattern.Type.TARGETS_BELOW_DIRECTORY) { if (laterParsedPattern.containsTBDForTBD(targetPattern) == ContainsTBDForTBDResult.DIRECTORY_EXCLUSION_WOULD_BE_EXACT) { return new TargetPatternKeyWithExclusionsResult(Optional.empty(), ImmutableList.of()); @@ -310,7 +311,7 @@ public final class TargetPatternValue implements SkyValue { InterruptibleSupplier<? extends Iterable<PathFragment>> blacklistedPackagePrefixes) throws InterruptedException { ImmutableSet.Builder<PathFragment> blacklistedPathsBuilder = ImmutableSet.builder(); - if (parsedPattern.getType() == Type.TARGETS_BELOW_DIRECTORY) { + if (parsedPattern.getType() == TargetPattern.Type.TARGETS_BELOW_DIRECTORY) { for (PathFragment blacklistedPackagePrefix : blacklistedPackagePrefixes.get()) { PackageIdentifier pkgIdForBlacklistedDirectorPrefix = PackageIdentifier.create( parsedPattern.getDirectoryForTargetsUnderDirectory().getRepository(), diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TestSuiteExpansionFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/TestSuiteExpansionFunction.java index a5a1cc2ae2..27343aabe7 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/TestSuiteExpansionFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/TestSuiteExpansionFunction.java @@ -30,7 +30,6 @@ import java.util.HashMap; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import javax.annotation.Nullable; @@ -92,7 +91,7 @@ final class TestSuiteExpansionFunction implements SkyFunction { ResolvedTargets.Builder<Target> builder = ResolvedTargets.builder(); builder.mergeError(hasError); Map<PackageIdentifier, Package> packageMap = new HashMap<>(); - for (Entry<SkyKey, SkyValue> entry : packages.entrySet()) { + for (Map.Entry<SkyKey, SkyValue> entry : packages.entrySet()) { packageMap.put( (PackageIdentifier) entry.getKey().argument(), ((PackageValue) entry.getValue()).getPackage()); diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TestsInSuiteFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/TestsInSuiteFunction.java index cf1183310e..818ece3a85 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/TestsInSuiteFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/TestsInSuiteFunction.java @@ -41,7 +41,6 @@ import java.util.HashMap; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import javax.annotation.Nullable; @@ -143,7 +142,8 @@ final class TestsInSuiteFunction implements SkyFunction { } boolean hasError = false; Map<PackageIdentifier, Package> packageMap = new HashMap<>(); - for (Entry<SkyKey, ValueOrException<BuildFileNotFoundException>> entry : packages.entrySet()) { + for (Map.Entry<SkyKey, ValueOrException<BuildFileNotFoundException>> entry : + packages.entrySet()) { try { packageMap.put( (PackageIdentifier) entry.getKey().argument(), 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 : diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveTargetFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveTargetFunction.java index 2d820e7624..0252dced50 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveTargetFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveTargetFunction.java @@ -48,7 +48,6 @@ import java.util.HashMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import javax.annotation.Nullable; @@ -126,14 +125,14 @@ public class TransitiveTargetFunction TransitiveTargetValueBuilder builder, EventHandler eventHandler, TargetAndErrorIfAny targetAndErrorIfAny, - Iterable<Entry<SkyKey, ValueOrException2<NoSuchPackageException, NoSuchTargetException>>> + Iterable<Map.Entry<SkyKey, ValueOrException2<NoSuchPackageException, NoSuchTargetException>>> depEntries) throws InterruptedException { boolean successfulTransitiveLoading = builder.isSuccessfulTransitiveLoading(); Target target = targetAndErrorIfAny.getTarget(); NestedSetBuilder<Label> transitiveRootCauses = builder.getTransitiveRootCauses(); - for (Entry<SkyKey, ValueOrException2<NoSuchPackageException, NoSuchTargetException>> entry : + for (Map.Entry<SkyKey, ValueOrException2<NoSuchPackageException, NoSuchTargetException>> entry : depEntries) { Label depLabel = ((TransitiveTargetKey) entry.getKey()).getLabel(); TransitiveTargetValue transitiveTargetValue; diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveTraversalFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveTraversalFunction.java index eb7bd63320..fcda217c46 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveTraversalFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveTraversalFunction.java @@ -34,7 +34,6 @@ import com.google.devtools.build.skyframe.ValueOrException2; import java.util.Collection; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import javax.annotation.Nullable; /** @@ -69,9 +68,9 @@ public class TransitiveTraversalFunction FirstErrorMessageAccumulator accumulator, EventHandler eventHandler, TargetAndErrorIfAny targetAndErrorIfAny, - Iterable<Entry<SkyKey, ValueOrException2<NoSuchPackageException, NoSuchTargetException>>> + Iterable<Map.Entry<SkyKey, ValueOrException2<NoSuchPackageException, NoSuchTargetException>>> depEntries) { - for (Entry<SkyKey, ValueOrException2<NoSuchPackageException, NoSuchTargetException>> entry : + for (Map.Entry<SkyKey, ValueOrException2<NoSuchPackageException, NoSuchTargetException>> entry : depEntries) { TransitiveTraversalValue transitiveTraversalValue; try { |