Remove IsSuperTypeOf from simple type

darkdrag00nv2 · Oct 27, 2023 · 8a16ed2 · 8a16ed2
1 parent 3e3f169
commit 8a16ed2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/runtime/sema/simple_type.go b/runtime/sema/simple_type.go
@@ -35,7 +35,6 @@ type ValueIndexingInfo struct {
 // SimpleType represents a simple nominal type.
 type SimpleType struct {
 	ValueIndexingInfo   ValueIndexingInfo
-	IsSuperTypeOf       func(subType Type) bool
 	NestedTypes         *StringTypeOrderedMap
 	memberResolvers     map[string]MemberResolver
 	Members             func(*SimpleType) map[string]MemberResolver

diff --git a/runtime/sema/storable_type.go b/runtime/sema/storable_type.go
@@ -39,8 +39,4 @@ var StorableType = &SimpleType{
 	Comparable: false,
 	Exportable: false,
 	Importable: false,
-	IsSuperTypeOf: func(subType Type) bool {
-		storableResults := map[*Member]bool{}
-		return subType.IsStorable(storableResults)
-	},
 }
diff --git a/runtime/sema/type.go b/runtime/sema/type.go
@@ -5729,6 +5729,10 @@ func checkSubTypeWithoutEquality(subType Type, superType Type) bool {
 		return IsSubType(subType, StoragePathType) ||
 			IsSubType(subType, CapabilityPathType)
 
+	case StorableType:
+		storableResults := map[*Member]bool{}
+		return subType.IsStorable(storableResults)
+
 	case CapabilityPathType:
 		return IsSubType(subType, PrivatePathType) ||
 			IsSubType(subType, PublicPathType)
@@ -6333,12 +6337,6 @@ func checkSubTypeWithoutEquality(subType Type, superType Type) bool {
 				}
 			}
 		}
-
-	case *SimpleType:
-		if typedSuperType.IsSuperTypeOf == nil {
-			return false
-		}
-		return typedSuperType.IsSuperTypeOf(subType)
 	}
 
 	// TODO: enforce type arguments, remove this rule