Clean up code that directly imports nested classes like Builder, Entry, etc.
PiperOrigin-RevId: 194985259
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/Runfiles.java b/src/main/java/com/google/devtools/build/lib/analysis/Runfiles.java
index 40d6f49..2a332d6 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/Runfiles.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/Runfiles.java
@@ -45,7 +45,6 @@
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Objects;
import java.util.Set;
import java.util.TreeSet;
@@ -391,9 +390,9 @@
Map<PathFragment, Artifact> newManifest = new HashMap<>();
outer:
- for (Iterator<Entry<PathFragment, Artifact>> i = workingManifest.entrySet().iterator();
- i.hasNext(); ) {
- Entry<PathFragment, Artifact> entry = i.next();
+ for (Iterator<Map.Entry<PathFragment, Artifact>> i = workingManifest.entrySet().iterator();
+ i.hasNext(); ) {
+ Map.Entry<PathFragment, Artifact> entry = i.next();
PathFragment source = entry.getKey();
Artifact symlink = entry.getValue();
// drop nested entries; warn if this changes anything
