From 0a57d3dcb1cc014d65dbeb604035bb34a7191e29 Mon Sep 17 00:00:00 2001
From: jcater <jcater@google.com>
Date: Tue, 1 May 2018 20:33:18 -0700
Subject: Clean up code that directly imports nested classes like Builder,
 Entry, etc.

PiperOrigin-RevId: 195040539
---
 src/main/java/com/google/devtools/build/lib/syntax/Type.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/main/java/com/google/devtools/build/lib/syntax')

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/Type.java b/src/main/java/com/google/devtools/build/lib/syntax/Type.java
index b2ce2d35c0..d8509e3a37 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/Type.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/Type.java
@@ -31,7 +31,6 @@ import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Set;
 import java.util.logging.Level;
 import javax.annotation.Nullable;
@@ -441,7 +440,7 @@ public abstract class Type<T> {
     @Override
     public <T> void visitLabels(LabelVisitor<T> visitor, Object value, T context)
         throws InterruptedException {
-      for (Entry<KeyT, ValueT> entry : cast(value).entrySet()) {
+      for (Map.Entry<KeyT, ValueT> entry : cast(value).entrySet()) {
         keyType.visitLabels(visitor, entry.getKey(), context);
         valueType.visitLabels(visitor, entry.getValue(), context);
       }
@@ -503,7 +502,7 @@ public abstract class Type<T> {
       // It's possible that #convert() calls transform non-equal keys into equal ones so we can't
       // just use ImmutableMap.Builder() here (that throws on collisions).
       LinkedHashMap<KeyT, ValueT> result = new LinkedHashMap<>();
-      for (Entry<?, ?> elem : o.entrySet()) {
+      for (Map.Entry<?, ?> elem : o.entrySet()) {
         result.put(
             keyType.convert(elem.getKey(), "dict key element", context),
             valueType.convert(elem.getValue(), "dict value element", context));
-- 
cgit v1.2.3