diff options
author | 2015-09-29 18:09:12 +0000 | |
---|---|---|
committer | 2015-09-30 09:35:33 +0000 | |
commit | fa0ca9f04538287610757102b87eceb64fad1515 (patch) | |
tree | 7655035c42a9155ae024dfe0f2c90bc5d83007c8 /src | |
parent | c5993f8da2a9da8732fce876a36fdcf53499ca20 (diff) |
Change uses of Lists#newArrayListWithExpectedSize to ArrayList#ArrayList(int) when it's clear the author intended (the now deprecated) Lists#newArrayListWithCapacity. Also change uses of Lists#newArrayListWithCapacity in the affected files to ArrayList#ArrayList(int).
--
MOS_MIGRATED_REVID=104217692
Diffstat (limited to 'src')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/syntax/Type.java | 4 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/util/PathFragmentFilter.java | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/Type.java b/src/main/java/com/google/devtools/build/lib/syntax/Type.java index 4ebcbaae24..e876781816 100644 --- a/src/main/java/com/google/devtools/build/lib/syntax/Type.java +++ b/src/main/java/com/google/devtools/build/lib/syntax/Type.java @@ -19,10 +19,10 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; import com.google.devtools.build.lib.util.LoggingUtil; import com.google.devtools.build.lib.util.StringCanonicalizer; +import java.util.ArrayList; import java.util.Collection; import java.util.LinkedHashSet; import java.util.List; @@ -544,7 +544,7 @@ public abstract class Type<T> { } int index = 0; Iterable<?> iterable = (Iterable<?>) x; - List<ElemT> result = Lists.newArrayListWithExpectedSize(Iterables.size(iterable)); + List<ElemT> result = new ArrayList<>(Iterables.size(iterable)); for (Object elem : iterable) { ElemT converted = elemType.convert(elem, "element " + index + " of " + what, context); if (converted != null) { diff --git a/src/main/java/com/google/devtools/build/lib/util/PathFragmentFilter.java b/src/main/java/com/google/devtools/build/lib/util/PathFragmentFilter.java index dd29093a1d..d4eb7d7474 100644 --- a/src/main/java/com/google/devtools/build/lib/util/PathFragmentFilter.java +++ b/src/main/java/com/google/devtools/build/lib/util/PathFragmentFilter.java @@ -17,7 +17,6 @@ package com.google.devtools.build.lib.util; import com.google.common.base.Joiner; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; import com.google.devtools.build.lib.vfs.PathFragment; import com.google.devtools.common.options.Converter; @@ -99,7 +98,7 @@ public class PathFragmentFilter implements Serializable { @Override public String toString() { - List<String> list = Lists.newArrayListWithExpectedSize(inclusions.size() + exclusions.size()); + List<String> list = new ArrayList<>(inclusions.size() + exclusions.size()); for (PathFragment path : inclusions) { list.add(path.getPathString()); } |