Rename the new struct to make it a bit cleaner.

Author: qiongsiwu

clang/include/clang/Tooling/DependencyScanning/ModuleDepCollector.h

@@ -179,14 +179,14 @@ struct ModuleDeps {
   std::vector<PrebuiltModuleDep> PrebuiltModuleDeps;
 
   /// This struct contains information about a single dependency.
-  struct DepsInfo {
+  struct DepInfo {
     /// Identifies the dependency.
     ModuleID ID;
 
     /// Indicates if the module that has this dependency exports it or not.
     bool Exported = false;
 
-    bool operator<(const DepsInfo &Other) const {
+    bool operator<(const DepInfo &Other) const {
       return std::tie(ID, Exported) < std::tie(Other.ID, Other.Exported);
     }
   };
@@ -196,7 +196,7 @@ struct ModuleDeps {
   ///
   /// This may include modules with a different context hash when it can be
   /// determined that the differences are benign for this compilation.
-  std::vector<ModuleDeps::DepsInfo> ClangModuleDeps;
+  std::vector<ModuleDeps::DepInfo> ClangModuleDeps;
 
   /// The set of libraries or frameworks to link against when
   /// an entity from this module is used.
@@ -366,16 +366,16 @@ class ModuleDepCollector final : public DependencyCollector {
 
   /// Collect module map files for given modules.
   llvm::DenseSet<const FileEntry *>
-  collectModuleMapFiles(ArrayRef<ModuleDeps::DepsInfo> ClangModuleDeps) const;
+  collectModuleMapFiles(ArrayRef<ModuleDeps::DepInfo> ClangModuleDeps) const;
 
   /// Add module map files to the invocation, if needed.
   void addModuleMapFiles(CompilerInvocation &CI,
-                         ArrayRef<ModuleDeps::DepsInfo> ClangModuleDeps) const;
+                         ArrayRef<ModuleDeps::DepInfo> ClangModuleDeps) const;
   /// Add module files (pcm) to the invocation, if needed.
   void addModuleFiles(CompilerInvocation &CI,
-                      ArrayRef<ModuleDeps::DepsInfo> ClangModuleDeps) const;
+                      ArrayRef<ModuleDeps::DepInfo> ClangModuleDeps) const;
   void addModuleFiles(CowCompilerInvocation &CI,
-                      ArrayRef<ModuleDeps::DepsInfo> ClangModuleDeps) const;
+                      ArrayRef<ModuleDeps::DepInfo> ClangModuleDeps) const;
 
   /// Add paths that require looking up outputs to the given dependencies.
   void addOutputPaths(CowCompilerInvocation &CI, ModuleDeps &Deps);

clang/lib/Tooling/DependencyScanning/ModuleDepCollector.cpp

@@ -389,7 +389,7 @@ ModuleDepCollector::getInvocationAdjustedForModuleBuildWithoutOutputs(
 }
 
 llvm::DenseSet<const FileEntry *> ModuleDepCollector::collectModuleMapFiles(
-    ArrayRef<ModuleDeps::DepsInfo> ClangModuleDeps) const {
+    ArrayRef<ModuleDeps::DepInfo> ClangModuleDeps) const {
   llvm::DenseSet<const FileEntry *> ModuleMapFiles;
   for (const auto &MID : ClangModuleDeps) {
     ModuleDeps *MD = ModuleDepsByID.lookup(MID.ID);
@@ -405,7 +405,7 @@ llvm::DenseSet<const FileEntry *> ModuleDepCollector::collectModuleMapFiles(
 
 void ModuleDepCollector::addModuleMapFiles(
     CompilerInvocation &CI,
-    ArrayRef<ModuleDeps::DepsInfo> ClangModuleDeps) const {
+    ArrayRef<ModuleDeps::DepInfo> ClangModuleDeps) const {
   if (Service.shouldEagerLoadModules())
     return; // Only pcm is needed for eager load.
 
@@ -418,7 +418,7 @@ void ModuleDepCollector::addModuleMapFiles(
 
 void ModuleDepCollector::addModuleFiles(
     CompilerInvocation &CI,
-    ArrayRef<ModuleDeps::DepsInfo> ClangModuleDeps) const {
+    ArrayRef<ModuleDeps::DepInfo> ClangModuleDeps) const {
   for (const auto &MID : ClangModuleDeps) {
     ModuleDeps *MD = ModuleDepsByID.lookup(MID.ID);
     std::string PCMPath =
@@ -434,7 +434,7 @@ void ModuleDepCollector::addModuleFiles(
 
 void ModuleDepCollector::addModuleFiles(
     CowCompilerInvocation &CI,
-    ArrayRef<ModuleDeps::DepsInfo> ClangModuleDeps) const {
+    ArrayRef<ModuleDeps::DepInfo> ClangModuleDeps) const {
   for (const auto &MID : ClangModuleDeps) {
     ModuleDeps *MD = ModuleDepsByID.lookup(MID.ID);
     std::string PCMPath =
@@ -474,7 +474,7 @@ void ModuleDepCollector::applyDiscoveredDependencies(CompilerInvocation &CI) {
         CI.getFrontendOpts().ModuleMapFiles.emplace_back(
             CurrentModuleMap->getNameAsRequested());
 
-    SmallVector<ModuleDeps::DepsInfo> DirectDeps;
+    SmallVector<ModuleDeps::DepInfo> DirectDeps;
     for (const auto &KV : ModularDeps)
       if (DirectModularDeps.contains(KV.first))
         DirectDeps.push_back({KV.second->ID, /* Exported = */ false});

clang/tools/clang-scan-deps/ClangScanDeps.cpp

@@ -371,10 +371,10 @@ static auto toJSONSorted(llvm::json::OStream &JOS, std::vector<ModuleID> V) {
 }
 
 static auto toJSONSorted(llvm::json::OStream &JOS,
-                         std::vector<ModuleDeps::DepsInfo> V) {
+                         std::vector<ModuleDeps::DepInfo> V) {
   llvm::sort(V);
   return [&JOS, V = std::move(V)] {
-    for (const ModuleDeps::DepsInfo &MID : V)
+    for (const ModuleDeps::DepInfo &MID : V)
       toJSONModuleID(JOS, MID.ID.ContextHash, MID.ID.ModuleName, MID.Exported);
   };
 }