commit 355bcb75d9aeff6fbdfc12b9d7433536bf63c293
author Christoffer Quist Adamsen <christofferqa@google.com> Tue Aug 10 11:47:58 2021 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Tue Aug 10 11:47:58 2021 +0200
tree c4be52b5c7943b8bef5b990b4dab5b6ce3526e7a
parent b6d5f08522f076512cb224eb1632a225093b2214

Cleanup imports in DependentMinimumKeepInfoCollection

Change-Id: I37fbb3c0bcf9ea27167da362d31b1a4b1ed5a3ab

src/main/java/com/android/tools/r8/shaking/DependentMinimumKeepInfoCollection.java

diff --git a/src/main/java/com/android/tools/r8/shaking/DependentMinimumKeepInfoCollection.java b/src/main/java/com/android/tools/r8/shaking/DependentMinimumKeepInfoCollection.java
index 40f6bb5..aca76da 100644
--- a/src/main/java/com/android/tools/r8/shaking/DependentMinimumKeepInfoCollection.java
+++ b/src/main/java/com/android/tools/r8/shaking/DependentMinimumKeepInfoCollection.java
@@ -18,7 +18,7 @@
 import com.android.tools.r8.graph.ProgramMethod;
 import com.android.tools.r8.shaking.EnqueuerEvent.ClassEnqueuerEvent;
 import com.android.tools.r8.shaking.EnqueuerEvent.UnconditionalKeepInfoEvent;
-import com.android.tools.r8.shaking.KeepMethodInfo.Joiner;
+import com.android.tools.r8.shaking.KeepInfo.Joiner;
 import com.android.tools.r8.utils.MapUtils;
 import com.android.tools.r8.utils.TriConsumer;
 import java.util.HashMap;
@@ -47,7 +47,7 @@
       DexDefinitionSupplier definitions,
       TriConsumer<EnqueuerEvent, DexProgramClass, KeepClassInfo.Joiner> classConsumer,
       TriConsumer<EnqueuerEvent, ProgramField, KeepFieldInfo.Joiner> fieldConsumer,
-      TriConsumer<EnqueuerEvent, ProgramMethod, Joiner> methodConsumer) {
+      TriConsumer<EnqueuerEvent, ProgramMethod, KeepMethodInfo.Joiner> methodConsumer) {
     dependentMinimumKeepInfo.forEach(
         (preconditionEvent, minimumKeepInfo) ->
             minimumKeepInfo.forEach(
@@ -69,7 +69,7 @@
         preconditionEvent, ignoreKey(MinimumKeepInfoCollection::new));
   }
 
-  public KeepInfo.Joiner<?, ?, ?> getOrCreateMinimumKeepInfoFor(
+  public Joiner<?, ?, ?> getOrCreateMinimumKeepInfoFor(
       EnqueuerEvent preconditionEvent, DexReference reference) {
     return getOrCreateMinimumKeepInfoFor(preconditionEvent)
         .getOrCreateMinimumKeepInfoFor(reference);
@@ -79,8 +79,7 @@
     return getOrCreateMinimumKeepInfoFor(UnconditionalKeepInfoEvent.get());
   }
 
-  public KeepInfo.Joiner<?, ?, ?> getOrCreateUnconditionalMinimumKeepInfoFor(
-      DexReference reference) {
+  public Joiner<?, ?, ?> getOrCreateUnconditionalMinimumKeepInfoFor(DexReference reference) {
     return getOrCreateMinimumKeepInfoFor(UnconditionalKeepInfoEvent.get(), reference);
   }
 
@@ -141,7 +140,7 @@
     return internalRemove(preconditionEvent, minimumKeepInfo -> minimumKeepInfo.remove(method));
   }
 
-  private <J extends KeepInfo.Joiner<?, ?, ?>> J internalRemove(
+  private <J extends Joiner<?, ?, ?>> J internalRemove(
       EnqueuerEvent preconditionEvent, Function<MinimumKeepInfoCollection, J> fn) {
     MinimumKeepInfoCollection minimumKeepInfo = get(preconditionEvent);
     if (minimumKeepInfo == null) {