Fine. Rename BundleRequirementsManifest to RequirementsManifest.

Also rename `linkingBundleManifest` to `globalResultRequirements`.

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

Author: scheglov

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

@@ -1397,10 +1397,10 @@ class AnalysisDriver {
             libraryElement.typeSystem,
             strictCasts: analysisOptions.strictCasts);
 
-        BundleRequirementsManifest? libraryRequirements;
+        RequirementsManifest? requirements;
         if (withFineDependencies) {
-          libraryRequirements = BundleRequirementsManifest();
-          linkingBundleManifest = libraryRequirements;
+          requirements = RequirementsManifest();
+          globalResultRequirements = requirements;
         }
 
         var results = performance.run('LibraryAnalyzer', (performance) {
@@ -1418,7 +1418,7 @@ class AnalysisDriver {
         });
 
         if (withFineDependencies) {
-          linkingBundleManifest = null;
+          globalResultRequirements = null;
         }
 
         var isLibraryWithPriorityFile = _isLibraryWithPriorityFile(library);
@@ -1479,7 +1479,7 @@ class AnalysisDriver {
           _updateHasErrorOrWarningFlag(unitFile, resolvedUnit.errors);
         }
 
-        if (withFineDependencies && libraryRequirements != null) {
+        if (withFineDependencies && requirements != null) {
           performance.run('writeResolvedLibrary', (_) {
             var mapSink = BufferedSink();
             mapSink.writeMap(
@@ -1490,12 +1490,12 @@ class AnalysisDriver {
             var mapBytes = mapSink.takeBytes();
 
             library.lastResolutionResult = LibraryResolutionResult(
-              requirements: libraryRequirements!,
+              requirements: requirements!,
               bytes: mapBytes,
             );
 
             var sink = BufferedSink();
-            libraryRequirements.write(sink);
+            requirements.write(sink);
             sink.writeUint8List(mapBytes);
             var allBytes = sink.takeBytes();
 
@@ -1506,7 +1506,7 @@ class AnalysisDriver {
           _scheduler.eventsController.add(
             events.AnalyzedLibrary(
               library: library,
-              requirements: libraryRequirements,
+              requirements: requirements,
             ),
           );
         }
@@ -1784,7 +1784,7 @@ class AnalysisDriver {
 
             var reader = SummaryDataReader(reqAndUnitBytes);
             var requirements = performance.run('readRequirements', (_) {
-              return BundleRequirementsManifest.read(reader);
+              return RequirementsManifest.read(reader);
             });
 
             var failure = requirements.isSatisfied(
@@ -2099,7 +2099,7 @@ class AnalysisDriver {
               if (reqAndUnitBytes != null) {
                 var reader = SummaryDataReader(reqAndUnitBytes);
                 var requirements = performance.run('readRequirements', (_) {
-                  return BundleRequirementsManifest.read(reader);
+                  return RequirementsManifest.read(reader);
                 });
 
                 var failure = requirements.isSatisfied(

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

@@ -15,7 +15,7 @@ sealed class AnalysisDriverEvent {}
 /// The event after [library] analysis.
 final class AnalyzedLibrary extends AnalysisDriverEvent {
   final LibraryFileKind library;
-  final BundleRequirementsManifest? requirements;
+  final RequirementsManifest? requirements;
 
   AnalyzedLibrary({
     required this.library,
@@ -75,17 +75,16 @@ final class GetErrorsFromBytes extends AnalysisDriverEvent {
 }
 
 /// The event that libraries for [cycle] were linked, and accumulated the
-/// [requirementsManifest] to be checked if we try to reuse the summary bundle
-/// later.
+/// [requirements] to be checked if we try to reuse the summary bundle later.
 final class LinkLibraryCycle extends AnalysisDriverEvent {
   final LinkedElementFactory elementFactory;
   final LibraryCycle cycle;
-  final BundleRequirementsManifest? requirementsManifest;
+  final RequirementsManifest? requirements;
 
   LinkLibraryCycle({
     required this.elementFactory,
     required this.cycle,
-    required this.requirementsManifest,
+    required this.requirements,
   });
 }
 

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

@@ -2135,7 +2135,7 @@ abstract class LibraryOrAugmentationFileKind extends FileKind {
 
 /// The resolution result for a library.
 class LibraryResolutionResult {
-  final BundleRequirementsManifest requirements;
+  final RequirementsManifest requirements;
 
   /// Approximately serialized map of file URIs to diagnostics.
   /// See uses for precise details.

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

@@ -207,8 +207,8 @@ class LibraryContext {
         Uint8List linkedBytes;
         try {
           if (withFineDependencies) {
-            var requirementsManifest = BundleRequirementsManifest();
-            linkingBundleManifest = requirementsManifest;
+            var requirements = RequirementsManifest();
+            globalResultRequirements = requirements;
 
             var linkResult = performance.run('link', (performance) {
               return link(
@@ -219,7 +219,7 @@ class LibraryContext {
                 inputLibraryManifests: inputLibraryManifests,
               );
             });
-            linkingBundleManifest = null;
+            globalResultRequirements = null;
             linkedBytes = linkResult.resolutionBytes;
 
             var newLibraryManifests = <Uri, LibraryManifest>{};
@@ -234,16 +234,16 @@ class LibraryContext {
               elementFactory.libraryManifests.addAll(newLibraryManifests);
             });
 
-            requirementsManifest.addExports(
+            requirements.addExports(
               elementFactory: elementFactory,
               libraryUriSet: cycle.libraryUris,
             );
-            requirementsManifest.removeReqForLibs(cycle.libraryUris);
+            requirements.removeReqForLibs(cycle.libraryUris);
 
             bundleEntry = LinkedBundleEntry(
               apiSignature: cycle.nonTransitiveApiSignature,
               libraryManifests: newLibraryManifests,
-              requirements: requirementsManifest,
+              requirements: requirements,
               linkedBytes: linkedBytes,
             );
             linkedBundleProvider.put(
@@ -255,7 +255,7 @@ class LibraryContext {
               LinkLibraryCycle(
                 elementFactory: elementFactory,
                 cycle: cycle,
-                requirementsManifest: requirementsManifest,
+                requirements: requirements,
               ),
             );
           } else {
@@ -273,7 +273,7 @@ class LibraryContext {
             bundleEntry = LinkedBundleEntry(
               apiSignature: cycle.nonTransitiveApiSignature,
               libraryManifests: {},
-              requirements: BundleRequirementsManifest(),
+              requirements: RequirementsManifest(),
               linkedBytes: linkedBytes,
             );
             linkedBundleProvider.put(
@@ -285,7 +285,7 @@ class LibraryContext {
               LinkLibraryCycle(
                 elementFactory: elementFactory,
                 cycle: cycle,
-                requirementsManifest: null,
+                requirements: null,
               ),
             );
           }
@@ -472,7 +472,7 @@ class LinkedBundleEntry {
   /// These requirements are to the libraries in dependencies.
   ///
   /// If [withFineDependencies] is `false`, the requirements are empty.
-  final BundleRequirementsManifest requirements;
+  final RequirementsManifest requirements;
 
   /// The serialized libraries, for [BundleReader].
   final Uint8List linkedBytes;
@@ -523,7 +523,7 @@ class LinkedBundleProvider {
       readKey: () => reader.readUri(),
       readValue: () => LibraryManifest.read(reader),
     );
-    var requirements = BundleRequirementsManifest.read(reader);
+    var requirements = RequirementsManifest.read(reader);
     var linkedBytes = reader.readUint8List();
 
     var result = LinkedBundleEntry(

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

@@ -328,7 +328,7 @@ class InheritanceManager3 {
     int forMixinIndex = -1,
     bool forSuper = false,
   }) {
-    linkingBundleManifest?.notifyInterfaceRequest(
+    globalResultRequirements?.notifyInterfaceRequest(
         element: element.asElement2, nameObj: name);
     var interface = getInterface(element);
     if (forSuper) {

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

@@ -580,9 +580,9 @@ class PrefixScope implements Scope {
       );
     }
 
-    if (linkingBundleManifest case var linkingBundleManifest?) {
+    if (globalResultRequirements case var resultRequirements?) {
       for (var importedLibrary in _importedLibraries) {
-        linkingBundleManifest.notifyRequest(
+        resultRequirements.notifyRequest(
           importedLibrary: importedLibrary,
           nameStr: id,
         );