Clean up assigned type for HashSet and Map
Change-Id: I1b121992f2542ecd81925da1ec1aa30c3af52eec
diff --git a/src/main/java/com/android/tools/r8/dex/InheritanceClassInDexDistributor.java b/src/main/java/com/android/tools/r8/dex/InheritanceClassInDexDistributor.java
index f13d378..37649d3 100644
--- a/src/main/java/com/android/tools/r8/dex/InheritanceClassInDexDistributor.java
+++ b/src/main/java/com/android/tools/r8/dex/InheritanceClassInDexDistributor.java
@@ -421,7 +421,7 @@
VirtualFileCycler cycler = new VirtualFileCycler(dexes, namingLens, dexIndexOffset);
// Don't modify input dexBlackList. Think about modifying the input collection considering this
// is private API.
- HashSet<VirtualFile> currentBlackList = new HashSet<>(dexBlackList);
+ Set<VirtualFile> currentBlackList = new HashSet<>(dexBlackList);
// Don't put class expected to fail linking in the main dex, save main dex space for classes
// that may benefit to be in the main dex.
currentBlackList.add(mainDex);
@@ -620,7 +620,7 @@
int assignedClasses = 0;
int dexInitialSize = dex.classes().size();
boolean isLayerFullyAssigned = true;
- HashSet<DexProgramClass> remaining = new HashSet<>(classes);
+ Set<DexProgramClass> remaining = new HashSet<>(classes);
while (isLayerFullyAssigned && !remaining.isEmpty()) {
Set<DexProgramClass> toProcess = remaining;
remaining = new HashSet<>();
diff --git a/src/main/java/com/android/tools/r8/ir/optimize/MoveEliminator.java b/src/main/java/com/android/tools/r8/ir/optimize/MoveEliminator.java
index 55037e0..237a17e 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/MoveEliminator.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/MoveEliminator.java
@@ -8,9 +8,10 @@
import com.android.tools.r8.ir.code.Value;
import com.android.tools.r8.ir.regalloc.RegisterAllocator;
import java.util.HashSet;
+import java.util.Set;
class MoveEliminator {
- private final HashSet<Move> activeMoves = new HashSet<>();
+ private final Set<Move> activeMoves = new HashSet<>();
private final RegisterAllocator allocator;
MoveEliminator(RegisterAllocator allocator) {
diff --git a/src/main/java/com/android/tools/r8/utils/DisjointSets.java b/src/main/java/com/android/tools/r8/utils/DisjointSets.java
index 695bf62..a39b482 100644
--- a/src/main/java/com/android/tools/r8/utils/DisjointSets.java
+++ b/src/main/java/com/android/tools/r8/utils/DisjointSets.java
@@ -70,7 +70,7 @@
if (representative == null) {
return null;
}
- HashSet<T> result = new HashSet<>();
+ Set<T> result = new HashSet<>();
for (T t : parent.keySet()) {
// Find root with path-compression.
if (findSet(t).equals(representative)) {
diff --git a/src/main/java/com/android/tools/r8/utils/FeatureClassMapping.java b/src/main/java/com/android/tools/r8/utils/FeatureClassMapping.java
index 479492a..0230ec1 100644
--- a/src/main/java/com/android/tools/r8/utils/FeatureClassMapping.java
+++ b/src/main/java/com/android/tools/r8/utils/FeatureClassMapping.java
@@ -15,6 +15,8 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
+import java.util.Set;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.zip.ZipEntry;
@@ -46,11 +48,11 @@
@Keep
public final class FeatureClassMapping {
- HashMap<String, String> parsedRules = new HashMap<>(); // Already parsed rules.
- HashMap<String, String> parseNonClassRules = new HashMap<>();
+ Map<String, String> parsedRules = new HashMap<>(); // Already parsed rules.
+ Map<String, String> parseNonClassRules = new HashMap<>();
boolean usesOnlyExactMappings = true;
- HashSet<FeaturePredicate> mappings = new HashSet<>();
+ Set<FeaturePredicate> mappings = new HashSet<>();
Path mappingFile;
String baseName = DEFAULT_BASE_NAME;
