diff --git a/swift/extractor/SwiftExtractor.cpp b/swift/extractor/SwiftExtractor.cpp index 34772074df1..77e27c00f41 100644 --- 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 index 1d1b94a759c..f2b7f6baee2 100644 --- 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 index b3bbb1e7b4a..33b0614e435 100644 --- 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 index 4c29f9afebe..65cfea33995 100644 --- 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 index bfb245d9727..5797b892982 100644 --- 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 index 1261dc1a493..4ce4c8ae23b 100644 --- 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 #include diff --git a/swift/extractor/invocation/SwiftInvocationExtractor.cpp b/swift/extractor/invocation/SwiftInvocationExtractor.cpp index c2d77d91289..3ec5b9bf0a4 100644 --- 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 index 2a040db5bb7..f195193e5d7 100644 --- 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 index fed3b297e15..7b22aabec8f 100644 --- 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 index 8ac63aba085..f156aa9c984 100644 --- 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 index d1c3deca431..2ca5efa113d 100644 --- 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/log/BUILD.bazel b/swift/logging/BUILD.bazel similarity index 89% rename from swift/log/BUILD.bazel rename to swift/logging/BUILD.bazel index 7e9b84168da..598d3a3aa31 100644 --- a/swift/log/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/log/SwiftAssert.h b/swift/logging/SwiftAssert.h similarity index 97% rename from swift/log/SwiftAssert.h rename to swift/logging/SwiftAssert.h index fa632e3fd4b..9ffb3c5f860 100644 --- a/swift/log/SwiftAssert.h +++ b/swift/logging/SwiftAssert.h @@ -2,7 +2,7 @@ #include -#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/log/SwiftDiagnostics.cpp b/swift/logging/SwiftDiagnostics.cpp similarity index 97% rename from swift/log/SwiftDiagnostics.cpp rename to swift/logging/SwiftDiagnostics.cpp index a75cca5d5ae..0c3ae0fe88e 100644 --- a/swift/log/SwiftDiagnostics.cpp +++ b/swift/logging/SwiftDiagnostics.cpp @@ -1,4 +1,4 @@ -#include "swift/log/SwiftDiagnostics.h" +#include "swift/logging/SwiftDiagnostics.h" #include #include diff --git a/swift/log/SwiftDiagnostics.h b/swift/logging/SwiftDiagnostics.h similarity index 100% rename from swift/log/SwiftDiagnostics.h rename to swift/logging/SwiftDiagnostics.h diff --git a/swift/log/SwiftLogging.cpp b/swift/logging/SwiftLogging.cpp similarity index 99% rename from swift/log/SwiftLogging.cpp rename to swift/logging/SwiftLogging.cpp index 9dff83ec245..4f3e3607f2b 100644 --- a/swift/log/SwiftLogging.cpp +++ b/swift/logging/SwiftLogging.cpp @@ -1,4 +1,4 @@ -#include "swift/log/SwiftLogging.h" +#include "swift/logging/SwiftLogging.h" #include #include diff --git a/swift/log/SwiftLogging.h b/swift/logging/SwiftLogging.h similarity index 99% rename from swift/log/SwiftLogging.h rename to swift/logging/SwiftLogging.h index 24114b1b691..cf756c9e5a0 100644 --- a/swift/log/SwiftLogging.h +++ b/swift/logging/SwiftLogging.h @@ -13,7 +13,7 @@ #include #include -#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: