From 0f1c1cb754c6a4e30c6bfc781ac36f402b369263 Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Fri, 15 Nov 2024 16:16:12 +0100 Subject: [PATCH] clang-format: Sort doctest header at the bottom --- .clang-format | 3 +++ src/DNS_Mapping.cc | 3 ++- src/DNS_Mgr.cc | 3 ++- src/Dict.cc | 3 ++- src/Hash.cc | 3 ++- src/RE.cc | 3 ++- src/Reporter.cc | 3 ++- src/ZeekString.cc | 3 ++- src/analyzer/Analyzer.cc | 3 ++- src/analyzer/protocol/smtp/BDAT.cc | 3 ++- src/broker/Data.cc | 3 ++- src/file_analysis/FileReassembler.cc | 3 ++- src/logging/writers/ascii/Ascii.cc | 3 ++- src/net_util.cc | 3 ++- src/telemetry/Manager.cc | 3 ++- src/util.cc | 3 ++- src/zeek-setup.cc | 6 +++--- 17 files changed, 36 insertions(+), 18 deletions(-) diff --git a/.clang-format b/.clang-format index b652ea6568..79cb37414b 100644 --- a/.clang-format +++ b/.clang-format @@ -71,6 +71,7 @@ IncludeBlocks: Regroup # 4: any header that starts with "zeek/" # 5: everything else, which should catch any of the auto-generated code from the # build directory as well +# 6: third party doctest header # # Sections 0-1 and 2-3 get grouped together in their respective blocks IncludeCategories: @@ -86,6 +87,8 @@ IncludeCategories: - Regex: '^<[[:print:]]+>' Priority: 2 SortPriority: 3 + - Regex: '^"zeek/3rdparty/doctest.h' + Priority: 6 - Regex: '^"zeek/' Priority: 4 - Regex: '.*' diff --git a/src/DNS_Mapping.cc b/src/DNS_Mapping.cc index 6e2720f4b0..daed31eb23 100644 --- a/src/DNS_Mapping.cc +++ b/src/DNS_Mapping.cc @@ -2,10 +2,11 @@ #include -#include "zeek/3rdparty/doctest.h" #include "zeek/DNS_Mgr.h" #include "zeek/Reporter.h" +#include "zeek/3rdparty/doctest.h" + namespace zeek::detail { DNS_Mapping::DNS_Mapping(std::string host, struct hostent* h, uint32_t ttl, int type) { diff --git a/src/DNS_Mgr.cc b/src/DNS_Mgr.cc index 6c0409d64b..2bb2ba435e 100644 --- a/src/DNS_Mgr.cc +++ b/src/DNS_Mgr.cc @@ -32,7 +32,6 @@ using ztd::out_ptr::out_ptr; #include #include -#include "zeek/3rdparty/doctest.h" #include "zeek/DNS_Mapping.h" #include "zeek/Event.h" #include "zeek/Expr.h" @@ -47,6 +46,8 @@ using ztd::out_ptr::out_ptr; #include "zeek/iosource/Manager.h" #include "zeek/telemetry/Manager.h" +#include "zeek/3rdparty/doctest.h" + // Number of seconds we'll wait for a reply. constexpr int DNS_TIMEOUT = 5; diff --git a/src/Dict.cc b/src/Dict.cc index c02444bc57..3ef5047337 100644 --- a/src/Dict.cc +++ b/src/Dict.cc @@ -2,9 +2,10 @@ #include "zeek/Dict.h" -#include "zeek/3rdparty/doctest.h" #include "zeek/Hash.h" +#include "zeek/3rdparty/doctest.h" + namespace zeek { // namespace detail diff --git a/src/Hash.cc b/src/Hash.cc index 99dc21493b..a1f37bae0d 100644 --- a/src/Hash.cc +++ b/src/Hash.cc @@ -8,7 +8,6 @@ #include #include -#include "zeek/3rdparty/doctest.h" #include "zeek/DebugLogger.h" #include "zeek/Desc.h" #include "zeek/Reporter.h" @@ -18,6 +17,8 @@ #include "const.bif.netvar_h" +#include "zeek/3rdparty/doctest.h" + namespace zeek::detail { alignas(32) uint64_t KeyedHash::shared_highwayhash_key[4]; diff --git a/src/RE.cc b/src/RE.cc index afb600bd4a..bad2c01507 100644 --- a/src/RE.cc +++ b/src/RE.cc @@ -7,13 +7,14 @@ #include #include -#include "zeek/3rdparty/doctest.h" #include "zeek/CCL.h" #include "zeek/DFA.h" #include "zeek/EquivClass.h" #include "zeek/Reporter.h" #include "zeek/ZeekString.h" +#include "zeek/3rdparty/doctest.h" + zeek::detail::CCL* zeek::detail::curr_ccl = nullptr; zeek::detail::Specific_RE_Matcher* zeek::detail::rem = nullptr; zeek::detail::NFA_Machine* zeek::detail::nfa = nullptr; diff --git a/src/Reporter.cc b/src/Reporter.cc index 81da38db7b..6c8b1981e9 100644 --- a/src/Reporter.cc +++ b/src/Reporter.cc @@ -9,7 +9,6 @@ #include #include -#include "zeek/3rdparty/doctest.h" #include "zeek/Conn.h" #include "zeek/Desc.h" #include "zeek/Event.h" @@ -24,6 +23,8 @@ #include "zeek/plugin/Manager.h" #include "zeek/plugin/Plugin.h" +#include "zeek/3rdparty/doctest.h" + #ifdef SYSLOG_INT extern "C" { int openlog(const char* ident, int logopt, int facility); diff --git a/src/ZeekString.cc b/src/ZeekString.cc index e5bfaacd5c..f6e1ff7a9f 100644 --- a/src/ZeekString.cc +++ b/src/ZeekString.cc @@ -9,12 +9,13 @@ #include #include // Needed for unit testing -#include "zeek/3rdparty/doctest.h" #include "zeek/ID.h" #include "zeek/Reporter.h" #include "zeek/Val.h" #include "zeek/util.h" +#include "zeek/3rdparty/doctest.h" + #ifdef DEBUG #define DEBUG_STR(msg) DBG_LOG(zeek::DBG_STRING, msg) #else diff --git a/src/analyzer/Analyzer.cc b/src/analyzer/Analyzer.cc index 5db65b44a2..2bdea344f2 100644 --- a/src/analyzer/Analyzer.cc +++ b/src/analyzer/Analyzer.cc @@ -5,12 +5,13 @@ #include #include -#include "zeek/3rdparty/doctest.h" #include "zeek/Event.h" #include "zeek/ZeekString.h" #include "zeek/analyzer/Manager.h" #include "zeek/analyzer/protocol/pia/PIA.h" +#include "zeek/3rdparty/doctest.h" + namespace zeek::analyzer { class AnalyzerTimer final : public zeek::detail::Timer { diff --git a/src/analyzer/protocol/smtp/BDAT.cc b/src/analyzer/protocol/smtp/BDAT.cc index 630dfe9cbe..9bbd759c7a 100644 --- a/src/analyzer/protocol/smtp/BDAT.cc +++ b/src/analyzer/protocol/smtp/BDAT.cc @@ -1,11 +1,12 @@ #include "zeek/analyzer/protocol/smtp/BDAT.h" -#include "zeek/3rdparty/doctest.h" #include "zeek/Conn.h" #include "zeek/DebugLogger.h" #include "zeek/analyzer/protocol/mime/MIME.h" #include "zeek/util.h" +#include "zeek/3rdparty/doctest.h" + namespace zeek::analyzer::smtp::detail { diff --git a/src/broker/Data.cc b/src/broker/Data.cc index 4a685242f6..ee8777e986 100644 --- a/src/broker/Data.cc +++ b/src/broker/Data.cc @@ -2,7 +2,6 @@ #include -#include "zeek/3rdparty/doctest.h" #include "zeek/Desc.h" #include "zeek/File.h" #include "zeek/Func.h" @@ -13,6 +12,8 @@ #include "zeek/broker/data.bif.h" #include "zeek/module_util.h" +#include "zeek/3rdparty/doctest.h" + using namespace std; zeek::OpaqueTypePtr zeek::Broker::detail::opaque_of_data_type; diff --git a/src/file_analysis/FileReassembler.cc b/src/file_analysis/FileReassembler.cc index 010c783b1b..7745bcdc75 100644 --- a/src/file_analysis/FileReassembler.cc +++ b/src/file_analysis/FileReassembler.cc @@ -2,9 +2,10 @@ #include "zeek/file_analysis/FileReassembler.h" -#include "zeek/3rdparty/doctest.h" #include "zeek/file_analysis/File.h" +#include "zeek/3rdparty/doctest.h" + namespace zeek::file_analysis { class File; diff --git a/src/logging/writers/ascii/Ascii.cc b/src/logging/writers/ascii/Ascii.cc index 1c8751ba01..2bb356f3ab 100644 --- a/src/logging/writers/ascii/Ascii.cc +++ b/src/logging/writers/ascii/Ascii.cc @@ -15,7 +15,6 @@ #include #include -#include "zeek/3rdparty/doctest.h" #include "zeek/Func.h" #include "zeek/RunState.h" #include "zeek/logging/Manager.h" @@ -23,6 +22,8 @@ #include "zeek/threading/SerialTypes.h" #include "zeek/util.h" +#include "zeek/3rdparty/doctest.h" + using namespace std; using zeek::threading::Field; using zeek::threading::Value; diff --git a/src/net_util.cc b/src/net_util.cc index fa86ae335f..ccd6876fb3 100644 --- a/src/net_util.cc +++ b/src/net_util.cc @@ -10,11 +10,12 @@ #include #include -#include "zeek/3rdparty/doctest.h" #include "zeek/IP.h" #include "zeek/IPAddr.h" #include "zeek/Reporter.h" +#include "zeek/3rdparty/doctest.h" + const char* transport_proto_string(TransportProto proto) { switch ( proto ) { case TRANSPORT_TCP: return "tcp"; diff --git a/src/telemetry/Manager.cc b/src/telemetry/Manager.cc index 78a643d349..d6e8bb7aa3 100644 --- a/src/telemetry/Manager.cc +++ b/src/telemetry/Manager.cc @@ -15,7 +15,6 @@ #include #include -#include "zeek/3rdparty/doctest.h" #include "zeek/Func.h" #include "zeek/ID.h" #include "zeek/IPAddr.h" @@ -26,6 +25,8 @@ #include "zeek/telemetry/Timer.h" #include "zeek/threading/formatters/detail/json.h" +#include "zeek/3rdparty/doctest.h" + namespace zeek::telemetry { /** diff --git a/src/util.cc b/src/util.cc index fb31e61317..edc424fb4a 100644 --- a/src/util.cc +++ b/src/util.cc @@ -46,7 +46,6 @@ #include #include "zeek/3rdparty/ConvertUTF.h" -#include "zeek/3rdparty/doctest.h" #include "zeek/Desc.h" #include "zeek/Hash.h" #include "zeek/NetVar.h" @@ -60,6 +59,8 @@ #include "zeek/iosource/Manager.h" #include "zeek/iosource/PktSrc.h" +#include "zeek/3rdparty/doctest.h" + using namespace std; extern const char* proc_status_file; diff --git a/src/zeek-setup.cc b/src/zeek-setup.cc index 3cf44a5b7f..3e6e310b5d 100644 --- a/src/zeek-setup.cc +++ b/src/zeek-setup.cc @@ -20,9 +20,6 @@ #include "zeek/3rdparty/sqlite3.h" #endif -#define DOCTEST_CONFIG_IMPLEMENT - -#include "zeek/3rdparty/doctest.h" #include "zeek/Anon.h" #include "zeek/DFA.h" #include "zeek/DNS_Mgr.h" @@ -77,6 +74,9 @@ extern "C" { #include "zeek/3rdparty/setsignal.h" }; +#define DOCTEST_CONFIG_IMPLEMENT +#include "zeek/3rdparty/doctest.h" + zeek::detail::ScriptCoverageManager zeek::detail::script_coverage_mgr; #ifndef HAVE_STRSEP