diff options
author | Nathan Harmata <nharmata@google.com> | 2015-09-23 20:52:52 +0000 |
---|---|---|
committer | Philipp Wollermann <philwo@google.com> | 2015-09-24 14:20:05 +0000 |
commit | f7697878b73b78698f5c5c37df253060dfebdec4 (patch) | |
tree | 85ecf1626158fcec56f5d43b5ff6080d7deb3ccb /src/main/java/com | |
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')
6 files changed, 14 insertions, 43 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/packages/EnvironmentGroup.java b/src/main/java/com/google/devtools/build/lib/packages/EnvironmentGroup.java index b94705cc32..6094b11044 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/EnvironmentGroup.java +++ b/src/main/java/com/google/devtools/build/lib/packages/EnvironmentGroup.java @@ -313,16 +313,4 @@ public class EnvironmentGroup implements Target { public static String targetKind() { return "environment group"; } - - @Override - public boolean equals(Object o) { - // In a distributed implementation these may not be the same object. - if (o == this) { - return true; - } else if (!(o instanceof EnvironmentGroup)) { - return false; - } else { - return ((EnvironmentGroup) o).getLabel().equals(getLabel()); - } - } } diff --git a/src/main/java/com/google/devtools/build/lib/packages/FileTarget.java b/src/main/java/com/google/devtools/build/lib/packages/FileTarget.java index 3f3b7a3cc8..2552d7a77a 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/FileTarget.java +++ b/src/main/java/com/google/devtools/build/lib/packages/FileTarget.java @@ -64,11 +64,6 @@ public abstract class FileTarget implements Target, HasFilename { } @Override - public int hashCode() { - return label.hashCode(); - } - - @Override public Set<DistributionType> getDistributions() { return getPackage().getDefaultDistribs(); } diff --git a/src/main/java/com/google/devtools/build/lib/packages/InputFile.java b/src/main/java/com/google/devtools/build/lib/packages/InputFile.java index aad2447eab..7e9e9b9c25 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/InputFile.java +++ b/src/main/java/com/google/devtools/build/lib/packages/InputFile.java @@ -103,11 +103,6 @@ public final class InputFile extends FileTarget { } @Override - public int hashCode() { - return label.hashCode(); - } - - @Override public String getTargetKind() { return "source file"; } diff --git a/src/main/java/com/google/devtools/build/lib/packages/OutputFile.java b/src/main/java/com/google/devtools/build/lib/packages/OutputFile.java index e7398fc95a..7c4c6f8938 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/OutputFile.java +++ b/src/main/java/com/google/devtools/build/lib/packages/OutputFile.java @@ -59,9 +59,4 @@ public final class OutputFile extends FileTarget { public Location getLocation() { return generatingRule.getLocation(); } - - @Override - public int hashCode() { - return label.hashCode(); - } } diff --git a/src/main/java/com/google/devtools/build/lib/packages/Rule.java b/src/main/java/com/google/devtools/build/lib/packages/Rule.java index 6baa69f7a5..fa47dedbdd 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/Rule.java +++ b/src/main/java/com/google/devtools/build/lib/packages/Rule.java @@ -202,12 +202,12 @@ public final class Rule implements Target { @Override public Label getLabel() { - return attributeMap.getLabel(); + return label; } @Override public String getName() { - return attributeMap.getName(); + return label.getName(); } @Override @@ -572,11 +572,6 @@ public final class Rule implements Target { eventHandler.handle(Event.warn(location, message)); } - @Override - public int hashCode() { - return label.hashCode(); - } - /** * Returns a string of the form "cc_binary rule //foo:foo" * 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()); } |