Rename SwiftScan directory into DependencyScan

Author: artemcm

include/swift/SwiftScan/DependencyScanningTool.h renamed to include/swift/DependencyScan/DependencyScanningTool.h

@@ -15,7 +15,7 @@
 
 #include "swift/AST/ModuleDependencies.h"
 #include "swift/Frontend/PrintingDiagnosticConsumer.h"
-#include "swift/SwiftScan/ScanDependencies.h"
+#include "swift/DependencyScan/ScanDependencies.h"
 #include "llvm/ADT/StringMap.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/StringSet.h"
@@ -45,8 +45,7 @@ class DependencyScanningTool {
   /// module names (batch inputs) and output them to the
   /// BatchScanInput-specified output locations.
   ///
-  /// \returns a \c StringError with the diagnostic output if errors
-  /// occurred.
+  /// \returns a \c std::error_code if errors occured during scan.
   std::error_code getDependencies(ArrayRef<const char *> Command,
                                   const std::vector<BatchScanInput> &BatchInput,
                                   const llvm::StringSet<> &PlaceholderModules);
@@ -58,10 +57,10 @@ class DependencyScanningTool {
   initCompilerInstanceForScan(ArrayRef<const char *> Command);
 
   /// Shared cache of module dependencies, re-used by individual queries
-  /// during the lifetime of this Tool
+  /// during the lifetime of this Tool.
   std::unique_ptr<ModuleDependenciesCache> SharedCache;
 
-  /// A shared consumer that, for now, just prints the encountered diagnostics
+  /// A shared consumer that, for now, just prints the encountered diagnostics.
   PrintingDiagnosticConsumer PDC;
   llvm::BumpPtrAllocator Alloc;
   llvm::StringSaver Saver;

include/swift/SwiftScan/ScanDependencies.h renamed to include/swift/DependencyScan/ScanDependencies.h

@@ -19,6 +19,7 @@ add_subdirectory(ASTSectionImporter)
 add_subdirectory(Basic)
 add_subdirectory(ClangImporter)
 add_subdirectory(Demangling)
+add_subdirectory(DependencyScan)
 add_subdirectory(Driver)
 add_subdirectory(Frontend)
 add_subdirectory(FrontendTool)
@@ -36,7 +37,6 @@ add_subdirectory(PrintAsObjC)
 add_subdirectory(RemoteAST)
 add_subdirectory(Sema)
 add_subdirectory(Serialization)
-add_subdirectory(SwiftScan)
 add_subdirectory(SwiftDemangle)
 add_subdirectory(SwiftReflection)
 add_subdirectory(SwiftRemoteMirror)

lib/CMakeLists.txt

@@ -1,16 +1,16 @@
 set_swift_llvm_is_available()
-add_swift_host_library(SwiftScanTool STATIC
+add_swift_host_library(SwiftScan STATIC
   DependencyScanningTool.cpp
   ScanDependencies.cpp)
-add_dependencies(SwiftScanTool
+add_dependencies(SwiftScan
   swift-syntax-generated-headers
   SwiftOptions)
 
-target_link_libraries(SwiftScanTool INTERFACE
+target_link_libraries(SwiftScan INTERFACE
   clangAPINotes
   clangBasic)
 
-target_link_libraries(SwiftScanTool PRIVATE
+target_link_libraries(SwiftScan PRIVATE
     swiftClangImporter
     swiftDemangling
     swiftFrontend

lib/SwiftScan/CMakeLists.txt renamed to lib/DependencyScan/CMakeLists.txt

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "swift/SwiftScan/DependencyScanningTool.h"
+#include "swift/DependencyScan/DependencyScanningTool.h"
 #include "swift/AST/DiagnosticEngine.h"
 #include "swift/AST/DiagnosticsFrontend.h"
 #include "swift/Basic/LLVMInitialize.h"

lib/SwiftScan/DependencyScanningTool.cpp renamed to lib/DependencyScan/DependencyScanningTool.cpp

@@ -22,11 +22,11 @@
 #include "swift/Basic/Defer.h"
 #include "swift/Basic/LLVM.h"
 #include "swift/Basic/STLExtras.h"
+#include "swift/DependencyScan/ScanDependencies.h"
 #include "swift/Frontend/Frontend.h"
 #include "swift/Frontend/FrontendOptions.h"
 #include "swift/Frontend/ModuleInterfaceLoader.h"
 #include "swift/Strings.h"
-#include "swift/SwiftScan/ScanDependencies.h"
 #include "clang/Basic/Module.h"
 #include "llvm/ADT/SetVector.h"
 #include "llvm/ADT/StringMap.h"

lib/SwiftScan/ScanDependencies.cpp renamed to lib/DependencyScan/ScanDependencies.cpp

@@ -7,16 +7,16 @@ add_swift_host_library(swiftFrontendTool STATIC
   TBD.cpp)
 add_dependencies(swiftFrontendTool
   swift-syntax-generated-headers
-  SwiftScanTool
+  SwiftScan
   SwiftOptions)
 target_link_libraries(swiftFrontendTool INTERFACE
   clangAPINotes
-  SwiftScanTool
+  SwiftScan
   clangBasic)
 target_link_libraries(swiftFrontendTool PRIVATE
     swiftClangImporter
     swiftDemangling
-    SwiftScanTool
+    SwiftScan
     swiftFrontend
     swiftIDE
     swiftImmediate

lib/FrontendTool/CMakeLists.txt

@@ -21,7 +21,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "swift/FrontendTool/FrontendTool.h"
-#include "swift/SwiftScan/ScanDependencies.h"
+#include "swift/DependencyScan/ScanDependencies.h"
 #include "Dependencies.h"
 #include "TBD.h"
 #include "swift/Subsystems.h"

lib/FrontendTool/FrontendTool.cpp

@@ -4,7 +4,7 @@ add_swift_unittest(swiftScanTests
 
 target_link_libraries(swiftScanTests
   PRIVATE
-    SwiftScanTool)
+    SwiftScan)
 
 target_compile_definitions(swiftScanTests PRIVATE
   SWIFTLIB_DIR=\"${SWIFTLIB_DIR}\")

unittests/SwiftScan/CMakeLists.txt

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "swift/SwiftScan/DependencyScanningTool.h"
+#include "swift/DependencyScan/DependencyScanningTool.h"
 #include "gtest/gtest.h"
 #include <string>