Rename link2() to link(), deprecate link2().

Change-Id: Ib1709af2f01e8f0231891ff9790d0c33bf5d27b4
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/240503
Reviewed-by: Samuel Rawlins <srawlins@google.com>
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>

Author: scheglov

pkg/analyzer/lib/dart/sdk/build_sdk_summary.dart

@@ -106,7 +106,7 @@ class _Builder {
       Reference.root(),
     );
 
-    var linkResult = await link2(elementFactory, inputLibraries);
+    var linkResult = await link(elementFactory, inputLibraries);
 
     var bundleBuilder = PackageBundleBuilder();
     for (var library in inputLibraries) {

pkg/analyzer/lib/src/dart/analysis/library_context.dart

@@ -206,9 +206,7 @@ class LibraryContext {
         link2.LinkResult linkResult;
         try {
           timerLinking.start();
-          // TODO(scheglov) Migrate when we are ready to switch to async.
-          // ignore: deprecated_member_use_from_same_package
-          linkResult = await link2.link2(elementFactory, inputLibraries);
+          linkResult = await link2.link(elementFactory, inputLibraries);
           librariesLinked += cycle.libraries.length;
           counterLinkedLibraries += inputLibraries.length;
           timerLinking.stop();

pkg/analyzer/lib/src/dart/micro/resolve_file.dart

@@ -889,7 +889,7 @@ class _LibraryContext {
         }
         inputsTimer.stop();
 
-        var linkResult = await link2.link2(elementFactory, inputLibraries);
+        var linkResult = await link2.link(elementFactory, inputLibraries);
         librariesLinked += cycle.libraries.length;
 
         resolutionBytes = linkResult.resolutionBytes;

pkg/analyzer/lib/src/summary2/link.dart

@@ -26,7 +26,7 @@ import 'package:analyzer/src/summary2/variance_builder.dart';
 var timerLinkingLinkingBundle = Stopwatch();
 
 /// Note that AST units and tokens of [inputLibraries] will be damaged.
-Future<LinkResult> link2(
+Future<LinkResult> link(
   LinkedElementFactory elementFactory,
   List<LinkInputLibrary> inputLibraries,
 ) async {
@@ -37,6 +37,15 @@ Future<LinkResult> link2(
   );
 }
 
+/// Note that AST units and tokens of [inputLibraries] will be damaged.
+@Deprecated('Use link() instead')
+Future<LinkResult> link2(
+  LinkedElementFactory elementFactory,
+  List<LinkInputLibrary> inputLibraries,
+) async {
+  return link(elementFactory, inputLibraries);
+}
+
 class Linker {
   final LinkedElementFactory elementFactory;
 

pkg/analyzer/test/src/summary/elements_base.dart

@@ -102,7 +102,7 @@ abstract class ElementsBaseTest with ResourceProviderMixin {
       Reference.root(),
     );
 
-    var sdkLinkResult = await link2(elementFactory, inputLibraries);
+    var sdkLinkResult = await link(elementFactory, inputLibraries);
 
     return _sdkBundle = _SdkBundle(
       resolutionBytes: sdkLinkResult.resolutionBytes,
@@ -160,7 +160,7 @@ abstract class ElementsBaseTest with ResourceProviderMixin {
       ),
     );
 
-    var linkResult = await link2(elementFactory, inputLibraries);
+    var linkResult = await link(elementFactory, inputLibraries);
 
     if (!keepLinkingLibraries) {
       elementFactory.removeBundle(