From d866054c4d05e82225e7e7c1b5aa771ee38e09b5 Mon Sep 17 00:00:00 2001 From: Paul Berry Date: Wed, 17 Sep 2025 17:36:11 -0700 Subject: [PATCH] [analyzer] Remove BaseDeprecatedMemberUseVerifier.reportError2. During the element model migration, the method `BaseDeprecatedMemberUseVerifier.reportError` had to be split into a `reportError` and a `reportError2` version, to allow for a gradual migration to the new element model. Now that the element model migration is complete, there is no need to keep both methods. See: - https://dart-review.googlesource.com/c/sdk/+/396571, which added the `reportError2` method. - https://dart-review.googlesource.com/c/sdk/+/393603, which migrated the linter's use of `BaseDeprecatedMemberUseVerifier`. - https://dart-review.googlesource.com/c/sdk/+/402201, which migrated the analyzer's use of `BaseDeprecatedMemberUseVerifier`. Change-Id: I6a6a69641640a2865922fc9b3142e8160e6d4ea6 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/450142 Commit-Queue: Paul Berry Reviewed-by: Samuel Rawlins Reviewed-by: Konstantin Shcheglov --- .../src/error/deprecated_member_use_verifier.dart | 13 +------------ .../deprecated_member_use_from_same_package.dart | 2 +- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/pkg/analyzer/lib/src/error/deprecated_member_use_verifier.dart b/pkg/analyzer/lib/src/error/deprecated_member_use_verifier.dart index 79128b883fc..c9d83262746 100644 --- a/pkg/analyzer/lib/src/error/deprecated_member_use_verifier.dart +++ b/pkg/analyzer/lib/src/error/deprecated_member_use_verifier.dart @@ -111,18 +111,7 @@ abstract class BaseDeprecatedMemberUseVerifier { Element element, String displayName, String? message, - ) { - reportError2(errorEntity, element, displayName, message); - } - - void reportError2( - SyntacticEntity errorEntity, - Element element, - String displayName, - String? message, - ) { - reportError(errorEntity, element, displayName, message); - } + ); void simpleIdentifier(SimpleIdentifier node) { // Don't report declared identifiers. diff --git a/pkg/linter/lib/src/rules/deprecated_member_use_from_same_package.dart b/pkg/linter/lib/src/rules/deprecated_member_use_from_same_package.dart index fefa44574a4..abba9e159b9 100644 --- a/pkg/linter/lib/src/rules/deprecated_member_use_from_same_package.dart +++ b/pkg/linter/lib/src/rules/deprecated_member_use_from_same_package.dart @@ -55,7 +55,7 @@ class _DeprecatedMemberUseVerifier extends BaseDeprecatedMemberUseVerifier { _DeprecatedMemberUseVerifier(this._rule, this._workspacePackage); @override - void reportError2( + void reportError( SyntacticEntity errorEntity, Element element, String displayName,