fix the suggestion in the error when an interface is used as a type

recursively rewrite instead of just at root of type

runtime/sema/checker.go

@@ -2081,10 +2081,12 @@ func (checker *Checker) checkTypeAnnotation(typeAnnotation *TypeAnnotation, pos
 		)
 	}
 
-	if typeAnnotation.Type.ContainsFirstLevelInterfaceType() {
+	rewrittenType, rewritten := typeAnnotation.Type.RewriteWithRestrictedTypes()
+	if rewritten {
 		checker.report(
 			&InvalidInterfaceTypeError{
-				Type: typeAnnotation.Type,
+				ActualType:   typeAnnotation.Type,
+				ExpectedType: rewrittenType,
 				Range: ast.Range{
 					StartPos: pos.StartPosition(),
 					EndPos:   pos.EndPosition(),

runtime/sema/errors.go

@@ -1326,24 +1326,20 @@ func (*InvalidResourceAnnotationError) isSemanticError() {}
 // InvalidInterfaceTypeError
 
 type InvalidInterfaceTypeError struct {
-	Type Type
+	ActualType   Type
+	ExpectedType Type
 	ast.Range
 }
 
 func (e *InvalidInterfaceTypeError) Error() string {
-	return "invalid interface type"
+	return "invalid use of interface as type"
 }
 
 func (e *InvalidInterfaceTypeError) SecondaryError() string {
-	var restrictedAny Type = &AnyStructType{}
-	if e.Type.IsResourceType() {
-		restrictedAny = &AnyResourceType{}
-	}
-
 	return fmt.Sprintf(
-		"got `%[1]s`; consider using `%[2]s{%[1]s}`",
-		e.Type.QualifiedString(),
-		restrictedAny,
+		"got `%s`; consider using `%s`",
+		e.ActualType.QualifiedString(),
+		e.ExpectedType.QualifiedString(),
 	)
 }