Swift: rename log package to logging

redsun82 · redsun82 · commit bce483ddb1d2 · 2023-05-04T10:42:39.000+02:00
diff --git a/swift/extractor/SwiftExtractor.cpp b/swift/extractor/SwiftExtractor.cpp
@@ -15,7 +15,7 @@
 #include "swift/extractor/infra/SwiftLocationExtractor.h"
 #include "swift/extractor/infra/SwiftBodyEmissionStrategy.h"
 #include "swift/extractor/mangler/SwiftMangler.h"
-#include "swift/log/SwiftAssert.h"
+#include "swift/logging/SwiftAssert.h"
 
 using namespace codeql;
 using namespace std::string_literals;
diff --git a/swift/extractor/infra/BUILD.bazel b/swift/extractor/infra/BUILD.bazel
@@ -9,7 +9,7 @@ swift_cc_library(
         "//swift/extractor/config",
         "//swift/extractor/infra/file",
         "//swift/extractor/trap",
-        "//swift/log",
+        "//swift/logging",
         "//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/log/SwiftAssert.h"
+#include "swift/logging/SwiftAssert.h"
 
 namespace codeql {
 
diff --git a/swift/extractor/infra/file/BUILD.bazel b/swift/extractor/infra/file/BUILD.bazel
@@ -11,7 +11,7 @@ swift_cc_library(
         exclude = ["FsLogger.h"],
     ) + [":path_hash_workaround"],
     visibility = ["//swift:__subpackages__"],
-    deps = ["//swift/log"],
+    deps = ["//swift/logging"],
 )
 
 genrule(
diff --git a/swift/extractor/infra/file/FsLogger.h b/swift/extractor/infra/file/FsLogger.h
@@ -1,4 +1,4 @@
-#include "swift/log/SwiftLogging.h"
+#include "swift/logging/SwiftLogging.h"
 
 namespace codeql {
 namespace fs_logger {
diff --git a/swift/extractor/infra/file/TargetFile.cpp b/swift/extractor/infra/file/TargetFile.cpp
@@ -1,7 +1,7 @@
 #include "swift/extractor/infra/file/TargetFile.h"
 #include "swift/extractor/infra/file/FsLogger.h"
-#include "swift/log/SwiftLogging.h"
-#include "swift/log/SwiftAssert.h"
+#include "swift/logging/SwiftLogging.h"
+#include "swift/logging/SwiftAssert.h"
 
 #include <cassert>
 #include <cstdio>
diff --git a/swift/extractor/invocation/SwiftInvocationExtractor.cpp b/swift/extractor/invocation/SwiftInvocationExtractor.cpp
@@ -4,7 +4,7 @@
 #include "swift/extractor/trap/generated/TrapTags.h"
 #include "swift/extractor/infra/file/TargetFile.h"
 #include "swift/extractor/infra/file/Path.h"
-#include "swift/log/SwiftAssert.h"
+#include "swift/logging/SwiftAssert.h"
 #include "swift/extractor/mangler/SwiftMangler.h"
 
 namespace fs = std::filesystem;
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/log/SwiftAssert.h"
+#include "swift/logging/SwiftAssert.h"
 
 using namespace std::string_literals;
 using namespace codeql::main_logger;
diff --git a/swift/extractor/remapping/SwiftFileInterception.cpp b/swift/extractor/remapping/SwiftFileInterception.cpp
@@ -14,7 +14,7 @@
 
 #include "swift/extractor/infra/file/PathHash.h"
 #include "swift/extractor/infra/file/Path.h"
-#include "swift/log/SwiftAssert.h"
+#include "swift/logging/SwiftAssert.h"
 
 #ifdef __APPLE__
 // path is hardcoded as otherwise redirection could break when setting DYLD_FALLBACK_LIBRARY_PATH
diff --git a/swift/extractor/trap/BUILD.bazel b/swift/extractor/trap/BUILD.bazel
@@ -52,7 +52,7 @@ swift_cc_library(
     visibility = ["//visibility:public"],
     deps = [
         "//swift/extractor/infra/file",
-        "//swift/log",
+        "//swift/logging",
         "@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/log/SwiftLogging.h"
+#include "swift/logging/SwiftLogging.h"
 #include "swift/extractor/infra/SwiftMangledName.h"
 
 namespace codeql {
diff --git a/swift/logging/BUILD.bazel b/swift/logging/BUILD.bazel
@@ -1,5 +1,5 @@
 cc_library(
-    name = "log",
+    name = "logging",
     srcs = glob(["*.cpp"]),
     hdrs = glob(["*.h"]),
     visibility = ["//visibility:public"],
diff --git a/swift/logging/SwiftAssert.h b/swift/logging/SwiftAssert.h
@@ -2,7 +2,7 @@
 
 #include <cstdlib>
 
-#include "swift/log/SwiftLogging.h"
+#include "swift/logging/SwiftLogging.h"
 
 // assert CONDITION, which is always evaluated (once) regardless of the build type. If
 // CONDITION is not satisfied, emit a critical log optionally using provided format and arguments,
diff --git a/swift/logging/SwiftDiagnostics.cpp b/swift/logging/SwiftDiagnostics.cpp
@@ -1,4 +1,4 @@
-#include "swift/log/SwiftDiagnostics.h"
+#include "swift/logging/SwiftDiagnostics.h"
 
 #include <binlog/Entries.hpp>
 #include <nlohmann/json.hpp>
diff --git a/swift/logging/SwiftDiagnostics.h b/swift/logging/SwiftDiagnostics.h
diff --git a/swift/logging/SwiftLogging.cpp b/swift/logging/SwiftLogging.cpp
@@ -1,4 +1,4 @@
-#include "swift/log/SwiftLogging.h"
+#include "swift/logging/SwiftLogging.h"
 
 #include <filesystem>
 #include <stdlib.h>
diff --git a/swift/logging/SwiftLogging.h b/swift/logging/SwiftLogging.h
@@ -13,7 +13,7 @@
 #include <binlog/adapt_stdoptional.hpp>
 #include <binlog/adapt_stdvariant.hpp>
 
-#include "swift/log/SwiftDiagnostics.h"
+#include "swift/logging/SwiftDiagnostics.h"
 
 // Logging macros. These will call `logger()` to get a Logger instance, picking up any `logger`
 // defined in the current scope. Domain-specific loggers can be added or used by either:

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ swift_cc_library(`
`9`	`9`	`"//swift/extractor/config",`
`10`	`10`	`"//swift/extractor/infra/file",`
`11`	`11`	`"//swift/extractor/trap",`
`12`		`- "//swift/log",`
	`12`	`+ "//swift/logging",`
`13`	`13`	`"//swift/third_party/swift-llvm-support",`
`14`	`14`	`],`
`15`	`15`	`)`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ swift_cc_library(`
`11`	`11`	`exclude = ["FsLogger.h"],`
`12`	`12`	`) + [":path_hash_workaround"],`
`13`	`13`	`visibility = ["//swift:__subpackages__"],`
`14`		`- deps = ["//swift/log"],`
	`14`	`+ deps = ["//swift/logging"],`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`genrule(`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "swift/log/SwiftLogging.h"`
	`1`	`+#include "swift/logging/SwiftLogging.h"`
`2`	`2`
`3`	`3`	`namespace codeql {`
`4`	`4`	`namespace fs_logger {`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ swift_cc_library(`
`52`	`52`	`visibility = ["//visibility:public"],`
`53`	`53`	`deps = [`
`54`	`54`	`"//swift/extractor/infra/file",`
`55`		`- "//swift/log",`
	`55`	`+ "//swift/logging",`
`56`	`56`	`"@absl//absl/numeric:bits",`
`57`	`57`	`],`
`58`	`58`	`)`