Index: pkg/compiler/lib/src/kernel/types.dart |
diff --git a/pkg/compiler/lib/src/kernel/types.dart b/pkg/compiler/lib/src/kernel/types.dart |
index b57b79df09ce63e86961ba7cae8f303611c5bcbe..a0f6268c6a917bcfa7c4044ebbc96ae97976ca0b 100644 |
--- a/pkg/compiler/lib/src/kernel/types.dart |
+++ b/pkg/compiler/lib/src/kernel/types.dart |
@@ -7,8 +7,8 @@ part of dart2js.kernel.element_map; |
/// Support for subtype checks of kernel based [DartType]s. |
class _KernelDartTypes extends DartTypes { |
final KernelToElementMapImpl elementMap; |
- final SubtypeVisitor subtypeVisitor; |
- final PotentialSubtypeVisitor potentialSubtypeVisitor; |
+ final SubtypeVisitor<DartType> subtypeVisitor; |
+ final PotentialSubtypeVisitor<DartType> potentialSubtypeVisitor; |
_KernelDartTypes(this.elementMap) |
: this.subtypeVisitor = new _KernelSubtypeVisitor(elementMap), |
@@ -98,7 +98,8 @@ class _KernelOrderedTypeSetBuilder extends OrderedTypeSetBuilderBase { |
} |
} |
-abstract class _AbstractTypeRelationMixin implements AbstractTypeRelation { |
+abstract class _AbstractTypeRelationMixin |
+ implements AbstractTypeRelation<DartType> { |
KernelToElementMapImpl get elementMap; |
@override |
@@ -122,14 +123,14 @@ abstract class _AbstractTypeRelationMixin implements AbstractTypeRelation { |
} |
} |
-class _KernelSubtypeVisitor extends SubtypeVisitor |
+class _KernelSubtypeVisitor extends SubtypeVisitor<DartType> |
with _AbstractTypeRelationMixin { |
final KernelToElementMapImpl elementMap; |
_KernelSubtypeVisitor(this.elementMap); |
} |
-class _KernelPotentialSubtypeVisitor extends PotentialSubtypeVisitor |
+class _KernelPotentialSubtypeVisitor extends PotentialSubtypeVisitor<DartType> |
with _AbstractTypeRelationMixin { |
final KernelToElementMapImpl elementMap; |