Swift: move logging to a common directory

redsun82 · redsun82 · commit 0ad529dff82a · 2023-05-03T14:32:31.000+02:00
diff --git a/swift/extractor/infra/BUILD.bazel b/swift/extractor/infra/BUILD.bazel
@@ -8,8 +8,8 @@ swift_cc_library(
     deps = [
         "//swift/extractor/config",
         "//swift/extractor/infra/file",
-        "//swift/extractor/infra/log",
         "//swift/extractor/trap",
+        "//swift/log",
         "//swift/third_party/swift-llvm-support",
     ],
 )
diff --git a/swift/extractor/infra/SwiftDispatcher.h b/swift/extractor/infra/SwiftDispatcher.h
@@ -13,7 +13,7 @@
 #include "swift/extractor/infra/SwiftBodyEmissionStrategy.h"
 #include "swift/extractor/infra/SwiftMangledName.h"
 #include "swift/extractor/config/SwiftExtractorState.h"
-#include "swift/extractor/infra/log/SwiftLogging.h"
+#include "swift/log/SwiftLogging.h"
 
 namespace codeql {
 
diff --git a/swift/extractor/main.cpp b/swift/extractor/main.cpp
@@ -18,7 +18,7 @@
 #include "swift/extractor/invocation/SwiftInvocationExtractor.h"
 #include "swift/extractor/trap/TrapDomain.h"
 #include "swift/extractor/infra/file/Path.h"
-#include "swift/extractor/infra/log/SwiftLogging.h"
+#include "swift/log/SwiftLogging.h"
 
 using namespace std::string_literals;
 
diff --git a/swift/extractor/trap/BUILD.bazel b/swift/extractor/trap/BUILD.bazel
@@ -23,7 +23,10 @@ genrule(
         "--schema=$(location //swift:schema)",
         "--script-name=codegen/codegen.py",
     ]),
-    exec_tools = ["//misc/codegen", "//swift:schema"],
+    exec_tools = [
+        "//misc/codegen",
+        "//swift:schema",
+    ],
 )
 
 filegroup(
@@ -49,7 +52,7 @@ swift_cc_library(
     visibility = ["//visibility:public"],
     deps = [
         "//swift/extractor/infra/file",
-        "//swift/extractor/infra/log",
+        "//swift/log",
         "@absl//absl/numeric:bits",
     ],
 )
diff --git a/swift/extractor/trap/TrapDomain.h b/swift/extractor/trap/TrapDomain.h
@@ -5,7 +5,7 @@
 
 #include "swift/extractor/trap/TrapLabel.h"
 #include "swift/extractor/infra/file/TargetFile.h"
-#include "swift/extractor/infra/log/SwiftLogging.h"
+#include "swift/log/SwiftLogging.h"
 #include "swift/extractor/infra/SwiftMangledName.h"
 
 namespace codeql {
diff --git a/swift/log/BUILD.bazel b/swift/log/BUILD.bazel
diff --git a/swift/log/SwiftLogging.cpp b/swift/log/SwiftLogging.cpp
@@ -1,4 +1,4 @@
-#include "swift/extractor/infra/log/SwiftLogging.h"
+#include "swift/log/SwiftLogging.h"
 
 #include <filesystem>
 #include <stdlib.h>
diff --git a/swift/log/SwiftLogging.h b/swift/log/SwiftLogging.h

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "swift/extractor/infra/log/SwiftLogging.h"`
	`1`	`+#include "swift/log/SwiftLogging.h"`
`2`	`2`
`3`	`3`	`#include <filesystem>`
`4`	`4`	`#include <stdlib.h>`