diff options
author | 2016-08-22 16:19:52 +0000 | |
---|---|---|
committer | 2016-08-23 09:28:28 +0000 | |
commit | fb9e91d0d945088709afdde5f148563fb4ac7091 (patch) | |
tree | ed97a4aeee5fa2bb3edb40428fae4f1d74144852 /src/main | |
parent | 77fe154515d664345a21a167a1a3530a077ac820 (diff) |
Remove CppCompilationContext.equals/hashCode. Making them throw an exception
shows that they aren't actually used anymore. If they were, they wouldn't work
as expected as the nested sets that are used in the comparison don't implement
hashCode or equals.
--
MOS_MIGRATED_REVID=130945911
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompilationContext.java | 73 |
1 files changed, 1 insertions, 72 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompilationContext.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompilationContext.java index a3efb3d7da..0a6e8b5248 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompilationContext.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompilationContext.java @@ -32,7 +32,6 @@ import com.google.devtools.build.lib.util.Preconditions; import com.google.devtools.build.lib.vfs.PathFragment; import java.util.LinkedHashSet; import java.util.Map; -import java.util.Objects; import java.util.Set; /** @@ -90,7 +89,7 @@ public final class CppCompilationContext implements TransitiveInfoProvider { // True if this context is for a compilation that should use header modules from dependencies. private final boolean useHeaderModules; - // Derived from depsContexts; no need to consider it for equals/hashCode. + // Derived from depsContexts. private final ImmutableSet<Artifact> compilationPrerequisites; private CppCompilationContext( @@ -310,56 +309,6 @@ public final class CppCompilationContext implements TransitiveInfoProvider { return commandLineContext.defines; } - @Override - public boolean equals(Object obj) { - if (obj == this) { - return true; - } - if (!(obj instanceof CppCompilationContext)) { - return false; - } - CppCompilationContext other = (CppCompilationContext) obj; - return Objects.equals(headerModule, other.headerModule) - && Objects.equals(cppModuleMap, other.cppModuleMap) - && Objects.equals(picHeaderModule, other.picHeaderModule) - && commandLineContext.equals(other.commandLineContext) - && Objects.equals(declaredIncludeDirs, other.declaredIncludeDirs) - && Objects.equals(declaredIncludeWarnDirs, other.declaredIncludeWarnDirs) - && Objects.equals(declaredIncludeSrcs, other.declaredIncludeSrcs) - && Objects.equals(directModuleMaps, other.directModuleMaps) - && Objects.equals(headerModuleSrcs, other.headerModuleSrcs) - && Objects.equals(impliedHeaderModules, other.impliedHeaderModules) - && Objects.equals(picImpliedHeaderModules, other.picImpliedHeaderModules) - && Objects.equals(topLevelHeaderModules, other.topLevelHeaderModules) - && Objects.equals(picTopLevelHeaderModules, other.picTopLevelHeaderModules) - && Objects.equals(transitiveModuleMaps, other.transitiveModuleMaps) - && Objects.equals(compilationPrerequisites, other.compilationPrerequisites) - && (provideTransitiveModuleMaps == other.provideTransitiveModuleMaps) - && (useHeaderModules == other.useHeaderModules); - } - - @Override - public int hashCode() { - return Objects.hash( - headerModule, - picHeaderModule, - commandLineContext, - declaredIncludeDirs, - declaredIncludeWarnDirs, - declaredIncludeSrcs, - directModuleMaps, - headerModuleSrcs, - impliedHeaderModules, - picImpliedHeaderModules, - transitiveModuleMaps, - topLevelHeaderModules, - picTopLevelHeaderModules, - compilationPrerequisites, - cppModuleMap, - provideTransitiveModuleMaps, - useHeaderModules); - } - /** * Returns a context that is based on a given context but returns empty sets * for {@link #getDeclaredIncludeDirs()} and {@link #getDeclaredIncludeWarnDirs()}. @@ -488,26 +437,6 @@ public final class CppCompilationContext implements TransitiveInfoProvider { this.systemIncludeDirs = systemIncludeDirs; this.defines = defines; } - - @Override - public boolean equals(Object obj) { - if (obj == this) { - return true; - } - if (!(obj instanceof CommandLineContext)) { - return false; - } - CommandLineContext other = (CommandLineContext) obj; - return Objects.equals(includeDirs, other.includeDirs) - && Objects.equals(quoteIncludeDirs, other.quoteIncludeDirs) - && Objects.equals(systemIncludeDirs, other.systemIncludeDirs) - && Objects.equals(defines, other.defines); - } - - @Override - public int hashCode() { - return Objects.hash(includeDirs, quoteIncludeDirs, systemIncludeDirs, defines); - } } /** |