From e7aa8da81672448622fd1f7f940bf42082208266 Mon Sep 17 00:00:00 2001
From: Ben Deane <ben@elbeno.com>
Date: Thu, 27 Feb 2025 17:05:14 -0700
Subject: [PATCH 1/2] :arrow_up: Update `stdx` and use `stdx::env` instead of
 `logging::env`

---
 CMakeLists.txt                       |  2 +-
 include/flow/log.hpp                 |  2 +-
 include/log/catalog/mipi_builder.hpp |  4 +-
 include/log/catalog/mipi_encoder.hpp | 10 ++--
 include/log/env.hpp                  | 87 +---------------------------
 include/log/flavor.hpp               |  2 +-
 include/log/fmt/logger.hpp           |  4 +-
 include/log/log.hpp                  |  6 +-
 include/log/module.hpp               |  2 +-
 test/flow/custom_log_levels.cpp      | 14 ++---
 test/flow/log_levels.cpp             |  2 +-
 test/log/catalog1_lib.cpp            |  2 +-
 test/log/catalog2a_lib.cpp           |  3 +-
 test/log/catalog2b_lib.cpp           |  3 +-
 test/log/env.cpp                     | 11 ++--
 test/log/fmt_logger.cpp              |  2 +-
 test/log/mipi_encoder.cpp            | 15 +++--
 test/log/module_id.cpp               | 10 ++--
 18 files changed, 48 insertions(+), 133 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d86d885..660d660a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,7 +25,7 @@ include(cmake/string_catalog.cmake)
 add_versioned_package("gh:boostorg/mp11#boost-1.83.0")
 fmt_recipe(11.1.3)
 add_versioned_package("gh:intel/cpp-baremetal-concurrency#7c5b26c")
-add_versioned_package("gh:intel/cpp-std-extensions#37cc9c5")
+add_versioned_package("gh:intel/cpp-std-extensions#ec95cd6")
 add_versioned_package("gh:intel/cpp-baremetal-senders-and-receivers#73d95bc")
 
 set(GEN_STR_CATALOG
diff --git a/include/flow/log.hpp b/include/flow/log.hpp
index d34516ed..7a4f440e 100644
--- a/include/flow/log.hpp
+++ b/include/flow/log.hpp
@@ -9,7 +9,7 @@
 
 namespace flow {
 using default_log_env =
-    logging::make_env_t<logging::get_level, logging::level::TRACE>;
+    stdx::make_env_t<logging::get_level, logging::level::TRACE>;
 template <stdx::ct_string, typename...>
 constexpr auto log_env = default_log_env{};
 
diff --git a/include/log/catalog/mipi_builder.hpp b/include/log/catalog/mipi_builder.hpp
index 0352f051..476b417f 100644
--- a/include/log/catalog/mipi_builder.hpp
+++ b/include/log/catalog/mipi_builder.hpp
@@ -132,8 +132,6 @@ struct default_builder {
         return std::forward<T>(t).query(*this);
     }
 
-    CONSTEVAL auto operator()(auto &&) const {
-        return stdx::ct<default_builder{}>();
-    }
+    CONSTEVAL auto operator()(auto &&) const { return default_builder{}; }
 } get_builder;
 } // namespace logging::mipi
diff --git a/include/log/catalog/mipi_encoder.hpp b/include/log/catalog/mipi_encoder.hpp
index f06f2df0..c2f4a474 100644
--- a/include/log/catalog/mipi_encoder.hpp
+++ b/include/log/catalog/mipi_encoder.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <conc/concurrency.hpp>
 #include <log/catalog/catalog.hpp>
 #include <log/catalog/mipi_builder.hpp>
 #include <log/catalog/mipi_messages.hpp>
@@ -13,6 +12,8 @@
 #include <stdx/tuple.hpp>
 #include <stdx/utility.hpp>
 
+#include <conc/concurrency.hpp>
+
 #include <algorithm>
 #include <concepts>
 #include <cstdint>
@@ -49,11 +50,10 @@ template <typename TDestinations> struct log_handler {
 
     template <typename Env, typename Msg> auto log_msg(Msg msg) -> void {
         msg.apply([&]<typename S, typename... Args>(S, Args... args) {
-            constexpr auto L = stdx::to_underlying(get_level(Env{}).value);
+            constexpr auto L = stdx::to_underlying(get_level(Env{}));
             using Message = decltype(detail::to_message<S, Args...>());
-            using Module =
-                decltype(detail::to_module<get_module(Env{}).value>());
-            auto builder = get_builder(Env{}).value;
+            using Module = decltype(detail::to_module<get_module(Env{})>());
+            auto builder = get_builder(Env{});
             write(builder.template build<L>(catalog<Message>(),
                                             module<Module>(), args...));
         });
diff --git a/include/log/env.hpp b/include/log/env.hpp
index f11b8183..6bb047f0 100644
--- a/include/log/env.hpp
+++ b/include/log/env.hpp
@@ -1,90 +1,9 @@
 #pragma once
 
 #include <stdx/compiler.hpp>
-#include <stdx/ct_string.hpp>
-#include <stdx/utility.hpp>
+#include <stdx/env.hpp>
 
-#include <boost/mp11/algorithm.hpp>
-
-namespace logging {
-template <auto Query, auto Value> struct prop {
-    [[nodiscard]] CONSTEVAL static auto query(decltype(Query)) noexcept {
-        return Value;
-    }
-};
-
-namespace detail {
-template <typename Q, typename Env>
-concept valid_query_for = requires { Env::query(Q{}); };
-
-template <typename Q, typename... Envs>
-concept valid_query_over = (... or valid_query_for<Q, Envs>);
-
-template <typename Q> struct has_query {
-    template <typename Env>
-    using fn = std::bool_constant<valid_query_for<Q, Env>>;
-};
-} // namespace detail
-
-template <typename... Envs> struct env {
-    template <detail::valid_query_over<Envs...> Q>
-    CONSTEVAL static auto query(Q) noexcept {
-        using I = boost::mp11::mp_find_if_q<boost::mp11::mp_list<Envs...>,
-                                            detail::has_query<Q>>;
-        using E = boost::mp11::mp_at<boost::mp11::mp_list<Envs...>, I>;
-        return Q{}(E{});
-    }
-};
-
-namespace detail {
-template <typename T> struct autowrap {
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    CONSTEVAL autowrap(T t) : value(t) {}
-    T value;
-};
-
-// NOLINTNEXTLINE(modernize-avoid-c-arrays)
-template <std::size_t N> using str_lit_t = char const (&)[N];
-
-template <std::size_t N> struct autowrap<str_lit_t<N>> {
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    CONSTEVAL autowrap(str_lit_t<N> str) : value(str) {}
-    stdx::ct_string<N> value;
-};
-
-template <typename T> autowrap(T) -> autowrap<T>;
-template <std::size_t N> autowrap(str_lit_t<N>) -> autowrap<str_lit_t<N>>;
-
-template <auto V> struct wrap {
-    constexpr static auto value = V;
-};
-
-template <typename> struct for_each_pair;
-template <std::size_t... Is> struct for_each_pair<std::index_sequence<Is...>> {
-    template <auto... Args>
-    using type = env<
-        prop<boost::mp11::mp_at_c<boost::mp11::mp_list<wrap<Args>...>,
-                                  2 * Is>::value.value,
-             stdx::ct<boost::mp11::mp_at_c<boost::mp11::mp_list<wrap<Args>...>,
-                                           (2 * Is) + 1>::value.value>()>...>;
-};
-} // namespace detail
-
-template <typename Env = env<>>
-constexpr auto make_env = []<detail::autowrap... Args> {
-    using new_env_t = typename detail::for_each_pair<
-        std::make_index_sequence<sizeof...(Args) / 2>>::template type<Args...>;
-    return boost::mp11::mp_append<new_env_t, Env>{};
-};
-
-template <typename Env, detail::autowrap... Args>
-using extend_env_t = decltype(make_env<Env>.template operator()<Args...>());
-
-template <detail::autowrap... Args>
-using make_env_t = extend_env_t<env<>, Args...>;
-} // namespace logging
-
-using cib_log_env_t = logging::env<>;
+using cib_log_env_t = stdx::env<>;
 
 // NOLINTBEGIN(cppcoreguidelines-macro-usage)
 
@@ -96,7 +15,7 @@ using cib_log_env_t = logging::env<>;
 
 #define CIB_LOG_ENV_DECL(...)                                                  \
     [[maybe_unused]] typedef decltype([] {                                     \
-        return logging::extend_env_t<cib_log_env_t, __VA_ARGS__>{};            \
+        return stdx::extend_env_t<cib_log_env_t, __VA_ARGS__>{};               \
     }()) cib_log_env_t
 
 #define CIB_LOG_ENV(...)                                                       \
diff --git a/include/log/flavor.hpp b/include/log/flavor.hpp
index a8126248..f5da90e9 100644
--- a/include/log/flavor.hpp
+++ b/include/log/flavor.hpp
@@ -18,7 +18,7 @@ struct default_flavor_t;
     }
 
     CONSTEVAL auto operator()(auto &&) const {
-        return stdx::ct<stdx::type_identity<default_flavor_t>{}>();
+        return stdx::type_identity<default_flavor_t>{};
     }
 } get_flavor;
 } // namespace logging
diff --git a/include/log/fmt/logger.hpp b/include/log/fmt/logger.hpp
index c5987c75..5432d904 100644
--- a/include/log/fmt/logger.hpp
+++ b/include/log/fmt/logger.hpp
@@ -50,8 +50,8 @@ template <typename TDestinations> struct log_handler {
         stdx::for_each(
             [&](auto &out) {
                 ::fmt::format_to(out, "{:>8}us {} [{}]: ", currentTime,
-                                 level_wrapper<get_level(Env{}).value>{},
-                                 get_module(Env{}).value);
+                                 level_wrapper<get_level(Env{})>{},
+                                 get_module(Env{}));
                 msg.apply(
                     [&]<typename StringType>(StringType, auto const &...args) {
                         ::fmt::format_to(out, StringType::value, args...);
diff --git a/include/log/log.hpp b/include/log/log.hpp
index 4bebb621..bc4b8724 100644
--- a/include/log/log.hpp
+++ b/include/log/log.hpp
@@ -40,7 +40,7 @@ template <typename...> inline auto config = null::config{};
 
 template <typename Env, typename... Ts>
 constexpr static auto get_config() -> auto & {
-    using flavor_t = typename decltype(get_flavor(Env{}).value)::type;
+    using flavor_t = typename decltype(get_flavor(Env{}))::type;
     if constexpr (std::same_as<flavor_t, default_flavor_t>) {
         return config<Ts...>;
     } else {
@@ -63,7 +63,7 @@ static auto log(TArgs &&...args) -> void {
 
 #define CIB_LOG_WITH_LEVEL(LEVEL, MSG, ...)                                    \
     logging::log<                                                              \
-        logging::extend_env_t<cib_log_env_t, logging::get_level, LEVEL>>(      \
+        stdx::extend_env_t<cib_log_env_t, logging::get_level, LEVEL>>(         \
         __FILE__, __LINE__, sc::format(MSG##_sc __VA_OPT__(, ) __VA_ARGS__))
 
 #define CIB_TRACE(...)                                                         \
@@ -109,7 +109,7 @@ template <typename Env, typename... Ts> static auto log_version() -> void {
 } // namespace logging
 
 #define CIB_LOG_V(FLAVOR)                                                      \
-    logging::log_version<logging::extend_env_t<                                \
+    logging::log_version<stdx::extend_env_t<                                   \
         cib_log_env_t, logging::get_flavor, stdx::type_identity<FLAVOR>{}>>()
 #define CIB_LOG_VERSION() CIB_LOG_V(logging::default_flavor_t)
 
diff --git a/include/log/module.hpp b/include/log/module.hpp
index b36ec730..26eef322 100644
--- a/include/log/module.hpp
+++ b/include/log/module.hpp
@@ -18,7 +18,7 @@ namespace logging {
 
     CONSTEVAL auto operator()(auto &&) const {
         using namespace stdx::literals;
-        return "default"_ctst;
+        return "default"_cts;
     }
 } get_module;
 } // namespace logging
diff --git a/test/flow/custom_log_levels.cpp b/test/flow/custom_log_levels.cpp
index 9d22e497..e535d9ba 100644
--- a/test/flow/custom_log_levels.cpp
+++ b/test/flow/custom_log_levels.cpp
@@ -41,7 +41,7 @@ struct log_config {
         template <typename Env, typename FilenameStringType,
                   typename LineNumberType, typename MsgType>
         auto log(FilenameStringType, LineNumberType, MsgType const &) -> void {
-            log_calls.push_back(logging::get_level(Env{}).value);
+            log_calls.push_back(logging::get_level(Env{}));
         }
     };
     log_handler logger;
@@ -51,16 +51,16 @@ struct log_config {
 template <> inline auto logging::config<> = log_config{};
 
 using user1_log_env =
-    logging::extend_env_t<flow::default_log_env, logging::get_level,
-                          logging::level::USER1>;
+    stdx::extend_env_t<flow::default_log_env, logging::get_level,
+                       logging::level::USER1>;
 
 using user2_log_env =
-    logging::extend_env_t<flow::default_log_env, logging::get_level,
-                          logging::level::USER2>;
+    stdx::extend_env_t<flow::default_log_env, logging::get_level,
+                       logging::level::USER2>;
 
 using info_log_env =
-    logging::extend_env_t<flow::default_log_env, logging::get_level,
-                          logging::level::INFO>;
+    stdx::extend_env_t<flow::default_log_env, logging::get_level,
+                       logging::level::INFO>;
 
 template <> constexpr auto flow::log_env<"default"> = info_log_env{};
 
diff --git a/test/flow/log_levels.cpp b/test/flow/log_levels.cpp
index 82037067..35dc015d 100644
--- a/test/flow/log_levels.cpp
+++ b/test/flow/log_levels.cpp
@@ -38,7 +38,7 @@ struct log_config {
         template <typename Env, typename FilenameStringType,
                   typename LineNumberType, typename MsgType>
         auto log(FilenameStringType, LineNumberType, MsgType const &) -> void {
-            log_calls.push_back(logging::get_level(Env{}).value);
+            log_calls.push_back(logging::get_level(Env{}));
         }
     };
     log_handler logger;
diff --git a/test/log/catalog1_lib.cpp b/test/log/catalog1_lib.cpp
index 95dc1e9c..aa6fd15f 100644
--- a/test/log/catalog1_lib.cpp
+++ b/test/log/catalog1_lib.cpp
@@ -18,7 +18,7 @@ struct test_log_args_destination {
     }
 };
 
-using log_env1 = logging::make_env_t<logging::get_level, logging::level::TRACE>;
+using log_env1 = stdx::make_env_t<logging::get_level, logging::level::TRACE>;
 } // namespace
 
 auto log_zero_args() -> void;
diff --git a/test/log/catalog2a_lib.cpp b/test/log/catalog2a_lib.cpp
index eb441442..979d4c74 100644
--- a/test/log/catalog2a_lib.cpp
+++ b/test/log/catalog2a_lib.cpp
@@ -19,8 +19,7 @@ struct test_log_args_destination {
     }
 };
 
-using log_env2a =
-    logging::make_env_t<logging::get_level, logging::level::TRACE>;
+using log_env2a = stdx::make_env_t<logging::get_level, logging::level::TRACE>;
 } // namespace
 
 auto log_two_rt_args() -> void;
diff --git a/test/log/catalog2b_lib.cpp b/test/log/catalog2b_lib.cpp
index 573303dc..45e427f2 100644
--- a/test/log/catalog2b_lib.cpp
+++ b/test/log/catalog2b_lib.cpp
@@ -15,8 +15,7 @@ struct test_log_args_destination {
     auto log_by_args(std::uint32_t, auto...) -> void { ++log_calls; }
 };
 
-using log_env2b =
-    logging::make_env_t<logging::get_level, logging::level::TRACE>;
+using log_env2b = stdx::make_env_t<logging::get_level, logging::level::TRACE>;
 } // namespace
 
 auto log_rt_enum_arg() -> void;
diff --git a/test/log/env.cpp b/test/log/env.cpp
index 539067c2..98d1b6d9 100644
--- a/test/log/env.cpp
+++ b/test/log/env.cpp
@@ -5,6 +5,7 @@
 
 #include <catch2/catch_test_macros.hpp>
 
+#include <string>
 #include <string_view>
 #include <utility>
 #include <vector>
@@ -43,7 +44,7 @@ TEST_CASE("supplement environment", "[log_env]") {
         using namespace stdx::literals;
         CIB_LOG_ENV(logging::get_module, "hello");
         static_assert(custom(cib_log_env_t{}) == 1);
-        static_assert(logging::get_module(cib_log_env_t{}) == "hello"_ctst);
+        static_assert(logging::get_module(cib_log_env_t{}) == "hello"_cts);
     }
 }
 
@@ -52,19 +53,19 @@ TEST_CASE("multi-value environment", "[log_env]") {
 
     using namespace stdx::literals;
     static_assert(custom(cib_log_env_t{}) == 1);
-    static_assert(logging::get_module(cib_log_env_t{}) == "hello"_ctst);
+    static_assert(logging::get_module(cib_log_env_t{}) == "hello"_cts);
 }
 
 namespace {
-auto logged_modules = std::vector<std::string_view>{};
+auto logged_modules = std::vector<std::string>{};
 
 struct log_handler {
     template <typename Env, typename FilenameStringType,
               typename LineNumberType, typename MsgType>
     auto log(FilenameStringType, LineNumberType, MsgType const &) -> void {
         using namespace stdx::literals;
-        logged_modules.push_back(
-            std::string_view{logging::get_module(Env{}).value});
+        logged_modules.emplace_back(
+            std::string_view{logging::get_module(Env{})});
     }
 };
 
diff --git a/test/log/fmt_logger.cpp b/test/log/fmt_logger.cpp
index af3385c1..08451e11 100644
--- a/test/log/fmt_logger.cpp
+++ b/test/log/fmt_logger.cpp
@@ -163,7 +163,7 @@ inline auto logging::config<secure_t> =
     logging::fmt::config{std::back_inserter(secure_buffer)};
 
 #define SECURE_TRACE(MSG, ...)                                                 \
-    logging::log<logging::extend_env_t<                                        \
+    logging::log<stdx::extend_env_t<                                           \
         cib_log_env_t, logging::get_level, logging::level::TRACE,              \
         logging::get_flavor, stdx::type_identity<secure_t>{}>>(                \
         __FILE__, __LINE__, sc::format(MSG##_sc __VA_OPT__(, ) __VA_ARGS__))
diff --git a/test/log/mipi_encoder.cpp b/test/log/mipi_encoder.cpp
index b96b781b..c8c61779 100644
--- a/test/log/mipi_encoder.cpp
+++ b/test/log/mipi_encoder.cpp
@@ -49,16 +49,15 @@ struct test_conc_policy {
     return (static_cast<std::uint32_t>(test_string_id) << 4u) | 0x1u;
 }
 
-[[maybe_unused]] constexpr auto expected_catalog32_header(logging::level level,
-                                                          module_id m)
-    -> std::uint32_t {
+[[maybe_unused]] constexpr auto
+expected_catalog32_header(logging::level level, module_id m) -> std::uint32_t {
     return (0x1u << 24u) | (m << 16u) |
            (static_cast<std::uint32_t>(level) << 4u) | 0x3u;
 }
 
-[[maybe_unused]] constexpr auto expected_msg_header(logging::level level,
-                                                    module_id m, std::size_t sz)
-    -> std::uint32_t {
+[[maybe_unused]] constexpr auto
+expected_msg_header(logging::level level, module_id m,
+                    std::size_t sz) -> std::uint32_t {
     return sz > 0 ? expected_catalog32_header(level, m)
                   : expected_short32_header();
 }
@@ -125,7 +124,7 @@ struct test_log_version_destination {
     }
 };
 
-using log_env = logging::make_env_t<logging::get_level, logging::level::TRACE>;
+using log_env = stdx::make_env_t<logging::get_level, logging::level::TRACE>;
 } // namespace
 
 template <> inline auto conc::injected_policy<> = test_conc_policy{};
@@ -295,7 +294,7 @@ template <logging::level Level> struct test_catalog_args_destination {
 } // namespace
 
 TEST_CASE("log with overridden builder", "[mipi]") {
-    using catalog_env = logging::make_env_t<
+    using catalog_env = stdx::make_env_t<
         logging::get_level, logging::level::TRACE, logging::mipi::get_builder,
         logging::mipi::builder<logging::mipi::defn::catalog_msg_t>{}>;
 
diff --git a/test/log/module_id.cpp b/test/log/module_id.cpp
index 8b99411f..e75f6caf 100644
--- a/test/log/module_id.cpp
+++ b/test/log/module_id.cpp
@@ -9,7 +9,7 @@
 
 TEST_CASE("default log module id", "[module_id]") {
     using namespace stdx::literals;
-    static_assert(logging::get_module(cib_log_env_t{}) == "default"_ctst);
+    static_assert(logging::get_module(cib_log_env_t{}) == "default"_cts);
 }
 
 namespace ns {
@@ -17,14 +17,14 @@ CIB_LOG_MODULE("ns");
 
 TEST_CASE("log module id overridden at namespace scope", "[module_id]") {
     using namespace stdx::literals;
-    static_assert(logging::get_module(cib_log_env_t{}) == "ns"_ctst);
+    static_assert(logging::get_module(cib_log_env_t{}) == "ns"_cts);
 }
 } // namespace ns
 
 struct S {
     template <typename = void> constexpr static auto test() {
         using namespace stdx::literals;
-        static_assert(logging::get_module(cib_log_env_t{}) == "S"_ctst);
+        static_assert(logging::get_module(cib_log_env_t{}) == "S"_cts);
     }
 
     CIB_LOG_MODULE("S");
@@ -37,7 +37,7 @@ TEST_CASE("log module id overridden at class scope", "[module_id]") {
 template <typename = void> constexpr static auto func_test() {
     CIB_LOG_MODULE("fn");
     using namespace stdx::literals;
-    static_assert(logging::get_module(cib_log_env_t{}) == "fn"_ctst);
+    static_assert(logging::get_module(cib_log_env_t{}) == "fn"_cts);
 }
 
 TEST_CASE("log module id overridden at function scope", "[module_id]") {
@@ -50,6 +50,6 @@ TEST_CASE("log module id overridden at statement scope", "[module_id]") {
     {
         CIB_LOG_MODULE("statement");
         using namespace stdx::literals;
-        static_assert(logging::get_module(cib_log_env_t{}) == "statement"_ctst);
+        static_assert(logging::get_module(cib_log_env_t{}) == "statement"_cts);
     }
 }

From 329167a88c5f53f6a40257f17ca73d94e1162237 Mon Sep 17 00:00:00 2001
From: Ben Deane <ben@elbeno.com>
Date: Tue, 4 Mar 2025 10:44:00 -0700
Subject: [PATCH 2/2] :alien: Fix clang-format changes from upstream

---
 include/interrupt/dynamic_controller.hpp |  4 ++--
 test/interrupt/common.hpp                |  2 +-
 test/log/catalog1_lib.cpp                |  3 ++-
 test/log/catalog2a_lib.cpp               |  3 ++-
 test/log/catalog2b_lib.cpp               |  3 ++-
 test/log/mipi_encoder.cpp                | 14 ++++++++------
 test/msg/send.cpp                        |  5 +++--
 7 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/include/interrupt/dynamic_controller.hpp b/include/interrupt/dynamic_controller.hpp
index 0b006aba..cf9c93ee 100644
--- a/include/interrupt/dynamic_controller.hpp
+++ b/include/interrupt/dynamic_controller.hpp
@@ -1,12 +1,12 @@
 #pragma once
 
-#include <conc/concurrency.hpp>
-
 #include <stdx/compiler.hpp>
 #include <stdx/tuple.hpp>
 #include <stdx/tuple_algorithms.hpp>
 #include <stdx/type_traits.hpp>
 
+#include <conc/concurrency.hpp>
+
 #include <boost/mp11/algorithm.hpp>
 #include <boost/mp11/list.hpp>
 
diff --git a/test/interrupt/common.hpp b/test/interrupt/common.hpp
index afe51619..1959d19f 100644
--- a/test/interrupt/common.hpp
+++ b/test/interrupt/common.hpp
@@ -48,7 +48,7 @@ struct test_nexus {
 
 template <auto> struct enable_field_t {
     static inline bool value{};
-    constexpr friend auto operator==(enable_field_t, enable_field_t)
+    friend constexpr auto operator==(enable_field_t, enable_field_t)
         -> bool = default;
 };
 template <auto> struct status_field_t {
diff --git a/test/log/catalog1_lib.cpp b/test/log/catalog1_lib.cpp
index aa6fd15f..3d9f8131 100644
--- a/test/log/catalog1_lib.cpp
+++ b/test/log/catalog1_lib.cpp
@@ -1,8 +1,9 @@
 #include "catalog_concurrency.hpp"
 
-#include <conc/concurrency.hpp>
 #include <log/catalog/mipi_encoder.hpp>
 
+#include <conc/concurrency.hpp>
+
 #include <cstdint>
 
 template <> inline auto conc::injected_policy<> = test_conc_policy{};
diff --git a/test/log/catalog2a_lib.cpp b/test/log/catalog2a_lib.cpp
index 979d4c74..8a792f2f 100644
--- a/test/log/catalog2a_lib.cpp
+++ b/test/log/catalog2a_lib.cpp
@@ -1,9 +1,10 @@
 #include "catalog_concurrency.hpp"
 #include "catalog_enums.hpp"
 
-#include <conc/concurrency.hpp>
 #include <log/catalog/mipi_encoder.hpp>
 
+#include <conc/concurrency.hpp>
+
 #include <cstdint>
 
 template <> inline auto conc::injected_policy<> = test_conc_policy{};
diff --git a/test/log/catalog2b_lib.cpp b/test/log/catalog2b_lib.cpp
index 45e427f2..69c8432b 100644
--- a/test/log/catalog2b_lib.cpp
+++ b/test/log/catalog2b_lib.cpp
@@ -1,9 +1,10 @@
 #include "catalog_concurrency.hpp"
 #include "catalog_enums.hpp"
 
-#include <conc/concurrency.hpp>
 #include <log/catalog/mipi_encoder.hpp>
 
+#include <conc/concurrency.hpp>
+
 #include <cstdint>
 
 template <> inline auto conc::injected_policy<> = test_conc_policy{};
diff --git a/test/log/mipi_encoder.cpp b/test/log/mipi_encoder.cpp
index c8c61779..6dc4e157 100644
--- a/test/log/mipi_encoder.cpp
+++ b/test/log/mipi_encoder.cpp
@@ -1,9 +1,10 @@
-#include <conc/concurrency.hpp>
 #include <log/catalog/mipi_encoder.hpp>
 
 #include <stdx/concepts.hpp>
 #include <stdx/span.hpp>
 
+#include <conc/concurrency.hpp>
+
 #include <catch2/catch_test_macros.hpp>
 
 #include <array>
@@ -49,15 +50,16 @@ struct test_conc_policy {
     return (static_cast<std::uint32_t>(test_string_id) << 4u) | 0x1u;
 }
 
-[[maybe_unused]] constexpr auto
-expected_catalog32_header(logging::level level, module_id m) -> std::uint32_t {
+[[maybe_unused]] constexpr auto expected_catalog32_header(logging::level level,
+                                                          module_id m)
+    -> std::uint32_t {
     return (0x1u << 24u) | (m << 16u) |
            (static_cast<std::uint32_t>(level) << 4u) | 0x3u;
 }
 
-[[maybe_unused]] constexpr auto
-expected_msg_header(logging::level level, module_id m,
-                    std::size_t sz) -> std::uint32_t {
+[[maybe_unused]] constexpr auto expected_msg_header(logging::level level,
+                                                    module_id m, std::size_t sz)
+    -> std::uint32_t {
     return sz > 0 ? expected_catalog32_header(level, m)
                   : expected_short32_header();
 }
diff --git a/test/msg/send.cpp b/test/msg/send.cpp
index 70454f23..674bac0f 100644
--- a/test/msg/send.cpp
+++ b/test/msg/send.cpp
@@ -1,5 +1,3 @@
-#include <async/schedulers/trigger_manager.hpp>
-#include <async/start_detached.hpp>
 #include <cib/cib.hpp>
 #include <msg/callback.hpp>
 #include <msg/field.hpp>
@@ -7,6 +5,9 @@
 #include <msg/send.hpp>
 #include <msg/service.hpp>
 
+#include <async/schedulers/trigger_manager.hpp>
+#include <async/start_detached.hpp>
+
 #include <stdx/ct_conversions.hpp>
 #include <stdx/ct_string.hpp>