diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunction.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunction.java | 17 |
1 files changed, 9 insertions, 8 deletions
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); |