Delete deprecated TypeImpl.referencesAny and rename referencesAny2 to referencesAny.

Change-Id: I91252fbf366ddd02128315c942792ee1684e829b
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/436160
Reviewed-by: Konstantin Shcheglov <[email protected]>
Commit-Queue: Paul Berry <[email protected]>
Reviewed-by: Paul Berry <[email protected]>

Author: fshcheglov

pkg/analyzer/lib/src/dart/element/least_greatest_closure.dart

@@ -72,7 +72,7 @@ class LeastGreatestClosureHelper extends ReplacementVisitor {
     //  - The greatest closure of `S` with respect to `L` is `Function`
     for (var typeParameter in node.typeParameters) {
       if (typeParameter.bound case TypeImpl bound?
-          when bound.referencesAny2(eliminationTargets)) {
+          when bound.referencesAny(eliminationTargets)) {
         return _functionReplacement;
       }
     }

pkg/analyzer/lib/src/dart/element/type.dart

@@ -339,11 +339,10 @@ class FunctionTypeImpl extends TypeImpl
     );
   }
 
-  @Deprecated('Use referencesAny2() instead')
   @override
-  bool referencesAny(Set<TypeParameterFragmentImpl> parameters) {
+  bool referencesAny(Set<TypeParameterElementImpl> parameters) {
     if (typeFormals.any((element) {
-      assert(!parameters.contains(element));
+      assert(!parameters.contains(element.asElement2));
 
       var bound = element.bound;
       if (bound != null && bound.referencesAny(parameters)) {
@@ -366,32 +365,6 @@ class FunctionTypeImpl extends TypeImpl
     return returnType.referencesAny(parameters);
   }
 
-  @override
-  bool referencesAny2(Set<TypeParameterElementImpl> parameters) {
-    if (typeFormals.any((element) {
-      assert(!parameters.contains(element.asElement2));
-
-      var bound = element.bound;
-      if (bound != null && bound.referencesAny2(parameters)) {
-        return true;
-      }
-
-      var defaultType = element.defaultType;
-      return defaultType != null && defaultType.referencesAny2(parameters);
-    })) {
-      return true;
-    }
-
-    if (this.parameters.any((element) {
-      var type = element.type;
-      return type.referencesAny2(parameters);
-    })) {
-      return true;
-    }
-
-    return returnType.referencesAny2(parameters);
-  }
-
   @override
   TypeImpl withNullability(NullabilitySuffix nullabilitySuffix) {
     if (this.nullabilitySuffix == nullabilitySuffix) return this;
@@ -1130,17 +1103,11 @@ class InterfaceTypeImpl extends TypeImpl implements InterfaceType {
     );
   }
 
-  @Deprecated('Use referencesAny2() instead')
   @override
-  bool referencesAny(Set<TypeParameterFragmentImpl> parameters) {
+  bool referencesAny(Set<TypeParameterElementImpl> parameters) {
     return typeArguments.any((argument) => argument.referencesAny(parameters));
   }
 
-  @override
-  bool referencesAny2(Set<TypeParameterElementImpl> parameters) {
-    return typeArguments.any((argument) => argument.referencesAny2(parameters));
-  }
-
   @override
   InterfaceTypeImpl withNullability(NullabilitySuffix nullabilitySuffix) {
     if (this.nullabilitySuffix == nullabilitySuffix) return this;
@@ -1612,13 +1579,7 @@ abstract class TypeImpl implements DartType, SharedType {
   @override
   bool isStructurallyEqualTo(Object other) => this == other;
 
-  /// Returns true if this type references any of the [parameters].
-  @Deprecated('Use referencesAny2() instead')
-  bool referencesAny(Set<TypeParameterFragmentImpl> parameters) {
-    return false;
-  }
-
-  bool referencesAny2(Set<TypeParameterElementImpl> parameters) {
+  bool referencesAny(Set<TypeParameterElementImpl> parameters) {
     return false;
   }
 
@@ -1763,7 +1724,7 @@ class TypeParameterTypeImpl extends TypeImpl implements TypeParameterType {
   }
 
   @override
-  bool referencesAny2(Set<TypeParameterElementImpl> parameters) {
+  bool referencesAny(Set<TypeParameterElementImpl> parameters) {
     return parameters.contains(element);
   }
 

pkg/analyzer/test/src/dart/element/type_references_any_test.dart

@@ -60,12 +60,12 @@ class TypeReferencesAnyTest extends AbstractTypeSystemTest {
   }
 
   void _checkFalse(TypeImpl type) {
-    var actual = type.referencesAny2({T});
+    var actual = type.referencesAny({T});
     expect(actual, isFalse);
   }
 
   void _checkTrue(TypeImpl type) {
-    var actual = type.referencesAny2({T});
+    var actual = type.referencesAny({T});
     expect(actual, isTrue);
   }
 }