Global cleanup change.
--
PiperOrigin-RevId: 149797374
MOS_MIGRATED_REVID=149797374
diff --git a/src/main/java/com/google/devtools/build/lib/actions/ConcurrentMultimapWithHeadElement.java b/src/main/java/com/google/devtools/build/lib/actions/ConcurrentMultimapWithHeadElement.java
index 892134e..10eb006 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/ConcurrentMultimapWithHeadElement.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/ConcurrentMultimapWithHeadElement.java
@@ -18,11 +18,9 @@
import com.google.common.collect.Sets;
import com.google.devtools.build.lib.concurrent.ThreadSafety.ThreadHostile;
import com.google.devtools.build.lib.util.Preconditions;
-
import java.util.Iterator;
import java.util.Set;
import java.util.concurrent.ConcurrentMap;
-
import javax.annotation.Nullable;
/**
@@ -145,7 +143,7 @@
* the thread trying to add a new value to a set will fail, and knows to retrieve the entry anew
* from the map and try again.
*/
- private static final Set<Object> TOMBSTONE = ImmutableSet.of();
+ private static final ImmutableSet<Object> TOMBSTONE = ImmutableSet.of();
/**
* Return some value in the SmallSet.
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java
index 2ea11f5..72de4a2 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java
@@ -69,7 +69,6 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import java.util.Set;
import javax.annotation.Nullable;
/**
@@ -83,10 +82,8 @@
public static final InstrumentationSpec ANDROID_COLLECTION_SPEC = JavaCommon.JAVA_COLLECTION_SPEC
.withDependencyAttributes("deps", "data", "exports", "runtime_deps", "binary_under_test");
- public static final Set<String> TRANSITIVE_ATTRIBUTES = ImmutableSet.of(
- "deps",
- "exports"
- );
+ public static final ImmutableSet<String> TRANSITIVE_ATTRIBUTES =
+ ImmutableSet.of("deps", "exports");
public static final <T extends TransitiveInfoProvider> Iterable<T> getTransitivePrerequisites(
RuleContext ruleContext, Mode mode, final Class<T> classType) {
