commit cecb3a8887eec0bdd07fadf36d7f8a181801c6bd
author jcater <jcater@google.com> Tue May 01 14:37:48 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Tue May 01 14:39:40 2018 -0700
tree 41dad407b9ebf7244d95eabb51d825f188a3410d
parent 36745914cc043df70e8c50c975ef125593406c8a

Clean up code that directly imports nested classes like Builder, Entry, etc.

PiperOrigin-RevId: 194998981

src/main/java/com/google/devtools/build/lib/skyframe/GlobFunction.java

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 16846bc..3dcb7f6 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.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 @@
       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;