diff options
author | 2015-09-23 20:52:52 +0000 | |
---|---|---|
committer | 2015-09-24 14:20:05 +0000 | |
commit | f7697878b73b78698f5c5c37df253060dfebdec4 (patch) | |
tree | 85ecf1626158fcec56f5d43b5ff6080d7deb3ccb /src/main/java/com/google/devtools/build/lib/pkgcache/SrcTargetUtil.java | |
parent | 55dbdbd382d55bd1da17b0b2adfc8fadac181dbc (diff) |
Remove both of equals/hashCode from classes in lib/packages where either only one of them was implemented (potentially incorrectly) or the class really intends to have reference equality.
RELNOTES:
--
MOS_MIGRATED_REVID=103778746
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/pkgcache/SrcTargetUtil.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/pkgcache/SrcTargetUtil.java | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/pkgcache/SrcTargetUtil.java b/src/main/java/com/google/devtools/build/lib/pkgcache/SrcTargetUtil.java index 2fe44e70a9..4fd5969a19 100644 --- a/src/main/java/com/google/devtools/build/lib/pkgcache/SrcTargetUtil.java +++ b/src/main/java/com/google/devtools/build/lib/pkgcache/SrcTargetUtil.java @@ -59,7 +59,8 @@ public final class SrcTargetUtil { public static List<FileTarget> getSrcTargets(EventHandler eventHandler, Rule rule, TargetProvider provider) throws NoSuchTargetException, NoSuchPackageException, InterruptedException { - return getTargets(eventHandler, rule, SOURCE_ATTRIBUTES, Sets.newHashSet(rule), provider); + return getTargets(eventHandler, rule, SOURCE_ATTRIBUTES, Sets.newHashSet(rule.getLabel()), + provider); } // Attributes referring to "sources". @@ -89,7 +90,8 @@ public final class SrcTargetUtil { .add(HEADER_ATTRIBUTE) .add(TEXTUAL_HEADER_ATTRIBUTE) .build(); - return getTargets(eventHandler, rule, srcAndHdrAttributes, Sets.newHashSet(rule), provider); + return getTargets(eventHandler, rule, srcAndHdrAttributes, Sets.newHashSet(rule.getLabel()), + provider); } @ThreadSafety.ThreadSafe @@ -97,7 +99,8 @@ public final class SrcTargetUtil { TargetProvider provider) throws NoSuchTargetException, NoSuchPackageException, InterruptedException { return getTargets( - eventHandler, rule, ImmutableSet.of(HEADER_ATTRIBUTE), Sets.newHashSet(rule), provider); + eventHandler, rule, ImmutableSet.of(HEADER_ATTRIBUTE), Sets.newHashSet(rule.getLabel()), + provider); } @ThreadSafety.ThreadSafe @@ -105,7 +108,7 @@ public final class SrcTargetUtil { EventHandler eventHandler, Rule rule, TargetProvider provider) throws NoSuchTargetException, NoSuchPackageException, InterruptedException { return getTargets(eventHandler, rule, ImmutableSet.of(TEXTUAL_HEADER_ATTRIBUTE), - Sets.newHashSet(rule), provider); + Sets.newHashSet(rule.getLabel()), provider); } /** @@ -114,7 +117,7 @@ public final class SrcTargetUtil { private static List<FileTarget> getTargets(EventHandler eventHandler, Rule rule, ImmutableSet<String> attributes, - Set<Rule> visitedRules, + Set<Label> visitedRuleLabels, TargetProvider targetProvider) throws NoSuchTargetException, NoSuchPackageException, InterruptedException { List<Label> srcLabels = Lists.newArrayList(); @@ -142,11 +145,11 @@ public final class SrcTargetUtil { srcTargets.add((FileTarget) target); } else { Rule srcRule = target.getAssociatedRule(); - if (srcRule != null && !visitedRules.contains(srcRule)) { - visitedRules.add(srcRule); + if (srcRule != null && !visitedRuleLabels.contains(srcRule.getLabel())) { + visitedRuleLabels.add(srcRule.getLabel()); if ("filegroup".equals(srcRule.getRuleClass())) { - srcTargets.addAll(getTargets(eventHandler, srcRule, FILEGROUP_ATTRIBUTES, visitedRules, - targetProvider)); + srcTargets.addAll(getTargets(eventHandler, srcRule, FILEGROUP_ATTRIBUTES, + visitedRuleLabels, targetProvider)); } else { srcTargets.addAll(srcRule.getOutputFiles()); } |