diff options
author | cushon <cushon@google.com> | 2017-04-10 05:25:13 +0000 |
---|---|---|
committer | Jakob Buchgraber <buchgr@google.com> | 2017-04-10 11:48:41 +0200 |
commit | fe913c11dcbad2a65ac4626cf7d943af1642e742 (patch) | |
tree | 3c9fff1846ee95e10956733b71497a2753dfa733 | |
parent | 446ef450a44d8a70cd6da13c80d2dae5ee6ad444 (diff) |
Avoid calls to NestedSetBuilder#addAll(NestedSet)
PiperOrigin-RevId: 152654844
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/collect/nestedset/NestedSetBuilder.java | 13 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/genrule/GenRuleBase.java | 2 |
2 files changed, 5 insertions, 10 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/collect/nestedset/NestedSetBuilder.java b/src/main/java/com/google/devtools/build/lib/collect/nestedset/NestedSetBuilder.java index c3da6679bf..633572f7fb 100644 --- a/src/main/java/com/google/devtools/build/lib/collect/nestedset/NestedSetBuilder.java +++ b/src/main/java/com/google/devtools/build/lib/collect/nestedset/NestedSetBuilder.java @@ -20,7 +20,7 @@ import com.google.common.collect.Iterables; import com.google.common.collect.MapMaker; import com.google.devtools.build.lib.collect.CompactHashSet; import com.google.devtools.build.lib.util.Preconditions; - +import com.google.errorprone.annotations.DoNotCall; import java.util.concurrent.ConcurrentMap; /** @@ -81,16 +81,11 @@ public final class NestedSetBuilder<E> { return this; } - /** - * @deprecated Use {@link #addTransitive} to avoid excessive memory use. - */ + /** @deprecated Use {@link #addTransitive} to avoid excessive memory use. */ @Deprecated + @DoNotCall public NestedSetBuilder<E> addAll(NestedSet<? extends E> elements) { - // Do not delete this method, or else addAll(Iterable) calls with a NestedSet argument - // will not be flagged. - Iterable<? extends E> it = elements; - addAll(it); - return this; + throw new UnsupportedOperationException(); } /** diff --git a/src/main/java/com/google/devtools/build/lib/rules/genrule/GenRuleBase.java b/src/main/java/com/google/devtools/build/lib/rules/genrule/GenRuleBase.java index 407a45cb3d..ca50836a59 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/genrule/GenRuleBase.java +++ b/src/main/java/com/google/devtools/build/lib/rules/genrule/GenRuleBase.java @@ -180,7 +180,7 @@ public abstract class GenRuleBase implements RuleConfiguredTargetFactory { executionInfo.putAll(getExtraExecutionInfo(ruleContext, baseCommand)); NestedSetBuilder<Artifact> inputs = NestedSetBuilder.stableOrder(); - inputs.addAll(resolvedSrcs); + inputs.addTransitive(resolvedSrcs); inputs.addAll(commandHelper.getResolvedTools()); FilesToRunProvider genruleSetup = ruleContext.getPrerequisite("$genrule_setup", Mode.HOST, FilesToRunProvider.class); |