azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop isEqualTypeConstructor in favour of areEqualTypeConstructors

Browse Source
This commit is contained in:
Dmitry Savvinov
2020-10-02 17:44:35 +03:00
parent fc4b488d43
commit f02593074f
10 changed files with 10 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/resolve/OverridingUtil.java
-7
View File
@@ -995,13 +995,6 @@ public class OverridingUtil {
return super.areEqualTypeConstructors(a, b) || areEqualTypeConstructorsByAxioms(a, b);
}
@Override
public boolean isEqualTypeConstructors(
@NotNull TypeConstructorMarker c1, @NotNull TypeConstructorMarker c2
) {
return areEqualTypeConstructors(c1, c2);
}
private boolean areEqualTypeConstructorsByAxioms(@NotNull TypeConstructor a, @NotNull TypeConstructor b) {
if (equalityAxioms.equals(a, b)) return true;
if (matchingTypeConstructors == null) return false;
core/descriptors/src/org/jetbrains/kotlin/types/checker/ClassicTypeSystemContext.kt
+1 -1
View File
@@ -212,7 +212,7 @@ interface ClassicTypeSystemContext : TypeSystemInferenceExtensionContext, TypeSy
return this.typeConstructor
}
override fun isEqualTypeConstructors(c1: TypeConstructorMarker, c2: TypeConstructorMarker): Boolean {
override fun areEqualTypeConstructors(c1: TypeConstructorMarker, c2: TypeConstructorMarker): Boolean {
require(c1 is TypeConstructor, c1::errorMessage)
require(c2 is TypeConstructor, c2::errorMessage)
return c1 == c2