hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-16 16:53:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Swift: remove unneeded SwiftDiagnosticLogWrapper

Browse Source
This commit is contained in:
Paolo Tranquilli
2023-05-15 10:08:35 +02:00
parent a2cb331ebe
commit dbff3e4fa4
1 changed files with 8 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
swift/logging/SwiftLogging.h
View File

@@ -56,14 +56,14 @@
#define CODEQL_DIAGNOSTIC_LOG_FORMAT_PREFIX "[{}] "
// TODO(C++20) replace non-standard , ##__VA_ARGS__ with __VA_OPT__(,) __VA_ARGS__
#define DIAGNOSE_WITH_LEVEL(LEVEL, ID, FORMAT, ...) \
do { \
auto _now = ::binlog::clockNow(); \
const ::codeql::SwiftDiagnostic& _id = ID; \
::codeql::Log::diagnose(_id, std::chrono::nanoseconds{_now}, \
fmt::format(FORMAT, ##__VA_ARGS__)); \
LOG_WITH_LEVEL_AND_TIME(LEVEL, _now, CODEQL_DIAGNOSTIC_LOG_FORMAT_PREFIX FORMAT, \
::codeql::detail::SwiftDiagnosticLogWrapper{_id}, ##__VA_ARGS__); \
#define DIAGNOSE_WITH_LEVEL(LEVEL, ID, FORMAT, ...) \
do { \
auto _now = ::binlog::clockNow(); \
const ::codeql::SwiftDiagnostic& _id = ID; \
::codeql::Log::diagnose(_id, std::chrono::nanoseconds{_now}, \
fmt::format(FORMAT, ##__VA_ARGS__)); \
LOG_WITH_LEVEL_AND_TIME(LEVEL, _now, CODEQL_DIAGNOSTIC_LOG_FORMAT_PREFIX FORMAT, \
_id.abbreviation(), ##__VA_ARGS__); \
} while (false)
// avoid calling into binlog's original macros
@@ -232,34 +232,4 @@ class Logger {
Log::Level level_;
};
namespace detail {
struct SwiftDiagnosticLogWrapper {
const SwiftDiagnostic& value;
};
} // namespace detail
} // namespace codeql
namespace mserialize {
// log diagnostics wrapper using the abbreviation of the underlying diagnostic, using
// binlog/mserialize internal plumbing
template <>
struct CustomTag<codeql::detail::SwiftDiagnosticLogWrapper, void>
: detail::BuiltinTag<std::string> {
using T = codeql::detail::SwiftDiagnosticLogWrapper;
};
template <>
struct CustomSerializer<codeql::detail::SwiftDiagnosticLogWrapper, void> {
template <typename OutputStream>
static void serialize(const codeql::detail::SwiftDiagnosticLogWrapper& source,
OutputStream& out) {
mserialize::serialize(source.value.abbreviation(), out);
}
static size_t serialized_size(const codeql::detail::SwiftDiagnosticLogWrapper& source) {
return mserialize::serialized_size(source.value.abbreviation());
}
};
} // namespace mserialize