diff options
4 files changed, 11 insertions, 15 deletions
diff --git a/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluatorContext.java b/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluatorContext.java index 0b6a07bbc8..9365ffa008 100644 --- a/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluatorContext.java +++ b/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluatorContext.java @@ -13,8 +13,6 @@ // limitations under the License. package com.google.devtools.build.skyframe; -import static com.google.devtools.build.skyframe.QueryableGraph.Reason; - import com.google.common.base.Function; import com.google.common.base.Supplier; import com.google.common.base.Suppliers; @@ -24,6 +22,7 @@ import com.google.devtools.build.lib.events.Event; import com.google.devtools.build.lib.events.EventHandler; import com.google.devtools.build.lib.util.Preconditions; import com.google.devtools.build.skyframe.MemoizingEvaluator.EmittedEventState; +import com.google.devtools.build.skyframe.QueryableGraph.Reason; import java.util.Map; import java.util.concurrent.ForkJoinPool; import javax.annotation.Nullable; diff --git a/src/main/java/com/google/devtools/build/skyframe/SkyFunctionEnvironment.java b/src/main/java/com/google/devtools/build/skyframe/SkyFunctionEnvironment.java index 8e1d3cfb81..28fb5129a7 100644 --- a/src/main/java/com/google/devtools/build/skyframe/SkyFunctionEnvironment.java +++ b/src/main/java/com/google/devtools/build/skyframe/SkyFunctionEnvironment.java @@ -13,11 +13,8 @@ // limitations under the License. package com.google.devtools.build.skyframe; -import static com.google.devtools.build.skyframe.EvaluationProgressReceiver.EvaluationState; -import static com.google.devtools.build.skyframe.NodeEntry.DependencyState; import static com.google.devtools.build.skyframe.ParallelEvaluator.isDoneForBuild; import static com.google.devtools.build.skyframe.ParallelEvaluator.maybeGetValueFromError; -import static com.google.devtools.build.skyframe.QueryableGraph.Reason; import com.google.common.base.Function; import com.google.common.base.Predicates; @@ -35,7 +32,10 @@ import com.google.devtools.build.lib.events.StoredEventHandler; import com.google.devtools.build.lib.util.GroupedList; import com.google.devtools.build.lib.util.GroupedList.GroupedListHelper; import com.google.devtools.build.lib.util.Preconditions; +import com.google.devtools.build.skyframe.EvaluationProgressReceiver.EvaluationState; +import com.google.devtools.build.skyframe.NodeEntry.DependencyState; import com.google.devtools.build.skyframe.ParallelEvaluatorContext.EnqueueParentBehavior; +import com.google.devtools.build.skyframe.QueryableGraph.Reason; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; diff --git a/src/test/java/com/google/devtools/build/android/ziputils/ZipInTest.java b/src/test/java/com/google/devtools/build/android/ziputils/ZipInTest.java index 83942a6680..c29fc864c9 100644 --- a/src/test/java/com/google/devtools/build/android/ziputils/ZipInTest.java +++ b/src/test/java/com/google/devtools/build/android/ziputils/ZipInTest.java @@ -22,7 +22,6 @@ import static com.google.devtools.build.android.ziputils.EndOfCentralDirectory.E import static com.google.devtools.build.android.ziputils.EndOfCentralDirectory.ENDSIZ; import static com.google.devtools.build.android.ziputils.EndOfCentralDirectory.ENDSUB; import static com.google.devtools.build.android.ziputils.EndOfCentralDirectory.ENDTOT; -import static com.google.devtools.build.android.ziputils.ZipIn.ZipEntry; import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -30,16 +29,16 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.fail; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; - +import com.google.devtools.build.android.ziputils.ZipIn.ZipEntry; import java.io.IOException; import java.nio.ByteBuffer; import java.util.Arrays; import java.util.List; import java.util.zip.ZipInputStream; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Unit tests for {@link ZipIn}. diff --git a/src/test/java/com/google/devtools/build/lib/util/io/AnsiTerminalPrinterTest.java b/src/test/java/com/google/devtools/build/lib/util/io/AnsiTerminalPrinterTest.java index b67da3c890..d6423c6fa2 100644 --- a/src/test/java/com/google/devtools/build/lib/util/io/AnsiTerminalPrinterTest.java +++ b/src/test/java/com/google/devtools/build/lib/util/io/AnsiTerminalPrinterTest.java @@ -14,19 +14,17 @@ package com.google.devtools.build.lib.util.io; import static com.google.common.truth.Truth.assertThat; -import static com.google.devtools.build.lib.util.io.AnsiTerminalPrinter.Mode; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import com.google.devtools.build.lib.testutil.MoreAsserts; - +import com.google.devtools.build.lib.util.io.AnsiTerminalPrinter.Mode; +import java.io.ByteArrayOutputStream; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.io.ByteArrayOutputStream; - /** * A test for {@link AnsiTerminalPrinter}. */ |