From 7ff6cbde04c2b704de8c460bdaa60c816ca395f6 Mon Sep 17 00:00:00 2001 From: Glyn Matthews Date: Tue, 30 Dec 2025 10:17:18 +0100 Subject: [PATCH] Add rules to order headers --- .clang-format | 21 +++++++++++++++++-- include/skyr/concepts/url_concepts.hpp | 2 +- include/skyr/containers/static_vector.hpp | 6 +++--- include/skyr/core/check_input.hpp | 4 ++-- include/skyr/core/host.hpp | 12 +++++------ include/skyr/core/parse.hpp | 9 ++++---- include/skyr/core/parse_path.hpp | 1 + include/skyr/core/parse_query.hpp | 3 ++- include/skyr/core/schemes.hpp | 2 +- include/skyr/core/serialize.hpp | 1 + include/skyr/core/url_parse_state.hpp | 5 +++-- include/skyr/core/url_parser_context.hpp | 17 ++++++++------- include/skyr/core/url_record.hpp | 5 +++-- include/skyr/domain/domain.hpp | 13 ++++++------ include/skyr/domain/idna.hpp | 3 ++- include/skyr/domain/idna_tables.hpp | 1 + include/skyr/domain/punycode.hpp | 11 +++++----- include/skyr/filesystem/path.hpp | 5 +++-- include/skyr/json/json.hpp | 10 +++++---- include/skyr/network/ipv4_address.hpp | 21 ++++++++++--------- include/skyr/network/ipv6_address.hpp | 14 ++++++------- .../skyr/percent_encoding/percent_decode.hpp | 5 +++-- .../percent_encoding/percent_decode_range.hpp | 5 +++-- .../skyr/percent_encoding/percent_encode.hpp | 5 +++-- .../percent_encoding/percent_encoded_char.hpp | 4 ++-- include/skyr/platform/endianness.hpp | 2 +- include/skyr/unicode/code_point.hpp | 1 + include/skyr/unicode/code_points/u16.hpp | 3 ++- include/skyr/unicode/code_points/u8.hpp | 3 ++- include/skyr/unicode/core.hpp | 5 +++-- include/skyr/unicode/details/to_u8.hpp | 3 ++- .../ranges/transforms/u16_transform.hpp | 7 ++++--- .../ranges/transforms/u32_transform.hpp | 3 ++- .../ranges/transforms/u8_transform.hpp | 5 +++-- .../skyr/unicode/ranges/views/u16_view.hpp | 5 +++-- include/skyr/unicode/ranges/views/u8_view.hpp | 3 ++- .../ranges/views/unchecked_u8_view.hpp | 5 +++-- include/skyr/url.hpp | 17 ++++++++------- include/skyr/url_search_parameters.hpp | 13 ++++++------ tests/skyr/allocations/allocations.hpp | 4 ++-- tests/skyr/allocations/host_parsing_tests.cpp | 8 +++---- tests/skyr/containers/static_vector_tests.cpp | 2 ++ tests/skyr/core/parse_host_tests.cpp | 5 ++--- tests/skyr/core/parse_path_tests.cpp | 3 ++- tests/skyr/core/parse_query_tests.cpp | 3 ++- tests/skyr/core/url_parse_tests.cpp | 4 ++-- tests/skyr/core/url_serialize_tests.cpp | 4 ++-- tests/skyr/domain/domain_tests.cpp | 5 ++--- tests/skyr/domain/idna_table_tests.cpp | 3 ++- tests/skyr/domain/punycode_tests.cpp | 4 ++-- .../skyr/filesystem/filesystem_path_tests.cpp | 6 +++--- tests/skyr/json/json_query_tests.cpp | 6 +++--- tests/skyr/network/ipv4_address_tests.cpp | 3 ++- tests/skyr/network/ipv6_address_tests.cpp | 3 ++- .../percent_decoding_tests.cpp | 3 ++- .../percent_encoding_tests.cpp | 3 ++- tests/skyr/unicode/byte_conversion_tests.cpp | 4 ++-- .../skyr/unicode/unicode_code_point_tests.cpp | 5 ++--- tests/skyr/unicode/unicode_range_tests.cpp | 9 ++------ tests/skyr/unicode/unicode_tests.cpp | 10 +++------ tests/skyr/url/url_literal_tests.cpp | 5 ++--- .../skyr/url/url_search_parameters_tests.cpp | 4 ++-- tests/skyr/url/url_setter_tests.cpp | 3 ++- tests/skyr/url/url_tests.cpp | 5 ++--- tests/skyr/url/url_tests_with_exceptions.cpp | 5 ++--- tests/skyr/url/url_vector_tests.cpp | 4 ++-- 66 files changed, 212 insertions(+), 171 deletions(-) diff --git a/.clang-format b/.clang-format index 71b480db9..84868ec25 100644 --- a/.clang-format +++ b/.clang-format @@ -75,7 +75,7 @@ DerivePointerAlignment: false PointerAlignment: Left ReferenceAlignment: Left ReflowComments: true -SortIncludes: false +SortIncludes: CaseSensitive SortUsingDeclarations: false MaxEmptyLinesToKeep: 1 @@ -93,7 +93,24 @@ IndentRequiresClause: true SpaceAroundPointerQualifiers: Default # Include formatting -IncludeBlocks: Preserve +IncludeBlocks: Regroup +IncludeCategories: + # 1. Main header (e.g., foo.cpp includes foo.hpp first) + - Regex: '^".*\.hpp"$' + Priority: 1 + SortPriority: 1 + # 2. C++ standard library + - Regex: '^<[^/]+>$' + Priority: 2 + SortPriority: 2 + # 3. Third-party libraries (uni-algo, catch2, nlohmann) + - Regex: '^<(uni|catch2|nlohmann)/' + Priority: 3 + SortPriority: 3 + # 4. Project headers (skyr/...) + - Regex: '^ #include #include +#include namespace skyr { template diff --git a/include/skyr/containers/static_vector.hpp b/include/skyr/containers/static_vector.hpp index 89803696f..40319650d 100644 --- a/include/skyr/containers/static_vector.hpp +++ b/include/skyr/containers/static_vector.hpp @@ -6,12 +6,12 @@ #ifndef SKYR_CONTAINERS_STATIC_VECTOR_HPP #define SKYR_CONTAINERS_STATIC_VECTOR_HPP -#include #include -#include -#include #include +#include #include +#include +#include namespace skyr { /// diff --git a/include/skyr/core/check_input.hpp b/include/skyr/core/check_input.hpp index 8dfb444e0..cbb4a126f 100644 --- a/include/skyr/core/check_input.hpp +++ b/include/skyr/core/check_input.hpp @@ -6,10 +6,10 @@ #ifndef SKYR_CORE_CHECK_INPUT_HPP #define SKYR_CORE_CHECK_INPUT_HPP -#include -#include #include #include +#include +#include namespace skyr { constexpr static auto is_c0_control_or_space = [](auto byte) { diff --git a/include/skyr/core/host.hpp b/include/skyr/core/host.hpp index d0d15bc46..d88c2415b 100644 --- a/include/skyr/core/host.hpp +++ b/include/skyr/core/host.hpp @@ -6,19 +6,19 @@ #ifndef SKYR_CORE_HOST_HPP #define SKYR_CORE_HOST_HPP -#include -#include -#include #include +#include #include -#include #include +#include +#include + #include +#include #include #include -#include #include -#include +#include namespace skyr { /// Represents a domain name in a [URL host](https://url.spec.whatwg.org/#host-representation) diff --git a/include/skyr/core/parse.hpp b/include/skyr/core/parse.hpp index 7a250cad3..1f6c7c300 100644 --- a/include/skyr/core/parse.hpp +++ b/include/skyr/core/parse.hpp @@ -6,13 +6,14 @@ #ifndef SKYR_CORE_PARSE_HPP #define SKYR_CORE_PARSE_HPP -#include -#include #include -#include -#include +#include +#include + #include +#include #include +#include namespace skyr { namespace details { diff --git a/include/skyr/core/parse_path.hpp b/include/skyr/core/parse_path.hpp index 14be5fd0e..f6ce11a17 100644 --- a/include/skyr/core/parse_path.hpp +++ b/include/skyr/core/parse_path.hpp @@ -8,6 +8,7 @@ #include #include + #include namespace skyr { diff --git a/include/skyr/core/parse_query.hpp b/include/skyr/core/parse_query.hpp index f266c3d55..425de6b7f 100644 --- a/include/skyr/core/parse_query.hpp +++ b/include/skyr/core/parse_query.hpp @@ -6,9 +6,10 @@ #ifndef SKYR_CORE_PARSE_QUERY_HPP #define SKYR_CORE_PARSE_QUERY_HPP +#include #include #include -#include + #include namespace skyr { diff --git a/include/skyr/core/schemes.hpp b/include/skyr/core/schemes.hpp index 1163e59d5..0836bf76f 100644 --- a/include/skyr/core/schemes.hpp +++ b/include/skyr/core/schemes.hpp @@ -6,9 +6,9 @@ #ifndef SKYR_CORE_URL_SCHEMES_HPP #define SKYR_CORE_URL_SCHEMES_HPP -#include #include #include +#include namespace skyr { /// \param scheme diff --git a/include/skyr/core/serialize.hpp b/include/skyr/core/serialize.hpp index ff10357f9..762c0c7ed 100644 --- a/include/skyr/core/serialize.hpp +++ b/include/skyr/core/serialize.hpp @@ -8,6 +8,7 @@ #include #include + #include namespace skyr { diff --git a/include/skyr/core/url_parse_state.hpp b/include/skyr/core/url_parse_state.hpp index 5e141a0b5..ad0352bd7 100644 --- a/include/skyr/core/url_parse_state.hpp +++ b/include/skyr/core/url_parse_state.hpp @@ -6,9 +6,10 @@ #ifndef SKYR_URL_PARSE_STATE_HPP #define SKYR_URL_PARSE_STATE_HPP -#include -#include #include +#include +#include + #include namespace skyr { diff --git a/include/skyr/core/url_parser_context.hpp b/include/skyr/core/url_parser_context.hpp index 4222a1b7a..7a6d444f0 100644 --- a/include/skyr/core/url_parser_context.hpp +++ b/include/skyr/core/url_parser_context.hpp @@ -6,20 +6,21 @@ #ifndef SKYR_CORE_URL_PARSER_CONTEXT_HPP #define SKYR_CORE_URL_PARSER_CONTEXT_HPP +#include #include -#include -#include +#include #include #include -#include #include -#include -#include -#include -#include +#include +#include + #include -#include +#include +#include #include +#include +#include #include namespace skyr { diff --git a/include/skyr/core/url_record.hpp b/include/skyr/core/url_record.hpp index 2383e4bb4..e8bea79eb 100644 --- a/include/skyr/core/url_record.hpp +++ b/include/skyr/core/url_record.hpp @@ -6,10 +6,11 @@ #ifndef SKYR_CORE_URL_RECORD_HPP #define SKYR_CORE_URL_RECORD_HPP -#include -#include #include #include +#include +#include + #include #include diff --git a/include/skyr/domain/domain.hpp b/include/skyr/domain/domain.hpp index 75101a169..7636097db 100644 --- a/include/skyr/domain/domain.hpp +++ b/include/skyr/domain/domain.hpp @@ -6,18 +6,19 @@ #ifndef SKYR_DOMAIN_DOMAIN_HPP #define SKYR_DOMAIN_DOMAIN_HPP -#include -#include #include -#include #include +#include #include -#include -#include -#include +#include +#include + #include #include #include +#include +#include +#include namespace skyr { constexpr inline auto validate_label(std::u32string_view label, [[maybe_unused]] bool use_std3_ascii_rules, diff --git a/include/skyr/domain/idna.hpp b/include/skyr/domain/idna.hpp index e08e99e81..ba510dd0f 100644 --- a/include/skyr/domain/idna.hpp +++ b/include/skyr/domain/idna.hpp @@ -7,9 +7,10 @@ #define SKYR_DOMAIN_IDNA_HPP #include + #include -#include #include +#include namespace skyr::idna { /// diff --git a/include/skyr/domain/idna_tables.hpp b/include/skyr/domain/idna_tables.hpp index de802a63a..7586d7426 100644 --- a/include/skyr/domain/idna_tables.hpp +++ b/include/skyr/domain/idna_tables.hpp @@ -9,6 +9,7 @@ #include #include #include + #include namespace skyr::idna::details { diff --git a/include/skyr/domain/punycode.hpp b/include/skyr/domain/punycode.hpp index 9eda331e1..d18887402 100644 --- a/include/skyr/domain/punycode.hpp +++ b/include/skyr/domain/punycode.hpp @@ -6,14 +6,15 @@ #ifndef SKYR_DOMAIN_PUNYCODE_HPP #define SKYR_DOMAIN_PUNYCODE_HPP +#include +#include +#include +#include +#include #include #include -#include -#include #include -#include -#include -#include + #include namespace skyr { diff --git a/include/skyr/filesystem/path.hpp b/include/skyr/filesystem/path.hpp index 77b8799f5..98a6ce75b 100644 --- a/include/skyr/filesystem/path.hpp +++ b/include/skyr/filesystem/path.hpp @@ -6,10 +6,11 @@ #ifndef SKYR_FILESYSTEM_PATH_HPP #define SKYR_FILESYSTEM_PATH_HPP -#include #include -#include +#include + #include +#include namespace skyr { /// \namespace filesystem diff --git a/include/skyr/json/json.hpp b/include/skyr/json/json.hpp index 7729608f9..7085307c1 100644 --- a/include/skyr/json/json.hpp +++ b/include/skyr/json/json.hpp @@ -6,15 +6,17 @@ #ifndef SKYR_JSON_JSON_HPP #define SKYR_JSON_JSON_HPP -#include +#include +#include #include +#include #include -#include + #include -#include + #include -#include #include +#include namespace skyr { namespace json { diff --git a/include/skyr/network/ipv4_address.hpp b/include/skyr/network/ipv4_address.hpp index c3c806393..06e5ece44 100644 --- a/include/skyr/network/ipv4_address.hpp +++ b/include/skyr/network/ipv4_address.hpp @@ -6,20 +6,21 @@ #ifndef SKYR_NETWORK_IPV4_ADDRESS_HPP #define SKYR_NETWORK_IPV4_ADDRESS_HPP +#include #include -#include -#include -#include -#include #include +#include #include -#include #include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include + +#include +#include namespace skyr { /// Enumerates IPv4 address parsing errors @@ -28,7 +29,7 @@ enum class ipv4_address_errc { too_many_segments, /// The input contains an empty segment empty_segment, - /// The segment numers invalid + /// The segment numbers are invalid invalid_segment_number, /// Overflow overflow, diff --git a/include/skyr/network/ipv6_address.hpp b/include/skyr/network/ipv6_address.hpp index 50e9769fd..a4143eccf 100644 --- a/include/skyr/network/ipv6_address.hpp +++ b/include/skyr/network/ipv6_address.hpp @@ -6,19 +6,19 @@ #ifndef SKYR_NETWORK_IPV6_ADDRESS_HPP #define SKYR_NETWORK_IPV6_ADDRESS_HPP -#include -#include +#include #include -#include #include -#include +#include +#include #include #include -#include -#include +#include +#include +#include + #include #include -#include namespace skyr { /// Enumerates IPv6 address parsing errors diff --git a/include/skyr/percent_encoding/percent_decode.hpp b/include/skyr/percent_encoding/percent_decode.hpp index 7942ea72c..a737b2605 100644 --- a/include/skyr/percent_encoding/percent_decode.hpp +++ b/include/skyr/percent_encoding/percent_decode.hpp @@ -6,10 +6,11 @@ #ifndef SKYR_PERCENT_DECODING_PERCENT_DECODE_HPP #define SKYR_PERCENT_DECODING_PERCENT_DECODE_HPP -#include #include -#include +#include + #include +#include namespace skyr { /// Percent decodes the input diff --git a/include/skyr/percent_encoding/percent_decode_range.hpp b/include/skyr/percent_encoding/percent_decode_range.hpp index b7426d01c..dfbc878e4 100644 --- a/include/skyr/percent_encoding/percent_decode_range.hpp +++ b/include/skyr/percent_encoding/percent_decode_range.hpp @@ -6,10 +6,11 @@ #ifndef SKYR_PERCENT_ENCODING_PERCENT_DECODE_RANGE_HPP #define SKYR_PERCENT_ENCODING_PERCENT_DECODE_RANGE_HPP -#include -#include #include #include +#include +#include + #include #include diff --git a/include/skyr/percent_encoding/percent_encode.hpp b/include/skyr/percent_encoding/percent_encode.hpp index 612b4f7f6..5da8b3de6 100644 --- a/include/skyr/percent_encoding/percent_encode.hpp +++ b/include/skyr/percent_encoding/percent_encode.hpp @@ -6,9 +6,10 @@ #ifndef SKYR_PERCENT_ENCODING_PERCENT_ENCODE_HPP #define SKYR_PERCENT_ENCODING_PERCENT_ENCODE_HPP -#include -#include #include +#include +#include + #include namespace skyr { diff --git a/include/skyr/percent_encoding/percent_encoded_char.hpp b/include/skyr/percent_encoding/percent_encoded_char.hpp index 63f809446..adcc0b3d1 100644 --- a/include/skyr/percent_encoding/percent_encoded_char.hpp +++ b/include/skyr/percent_encoding/percent_encoded_char.hpp @@ -6,9 +6,9 @@ #ifndef SKYR_PERCENT_ENCODING_PERCENT_ENCODED_CHAR_HPP #define SKYR_PERCENT_ENCODING_PERCENT_ENCODED_CHAR_HPP -#include -#include #include +#include +#include namespace skyr { namespace percent_encoding { diff --git a/include/skyr/platform/endianness.hpp b/include/skyr/platform/endianness.hpp index a8b324801..581dc47c4 100644 --- a/include/skyr/platform/endianness.hpp +++ b/include/skyr/platform/endianness.hpp @@ -6,9 +6,9 @@ #ifndef SKYR_PLATFORM_ENDIANNESS_HPP #define SKYR_PLATFORM_ENDIANNESS_HPP +#include #include #include -#include namespace skyr { namespace details { diff --git a/include/skyr/unicode/code_point.hpp b/include/skyr/unicode/code_point.hpp index 7150244a2..5f5b2f263 100644 --- a/include/skyr/unicode/code_point.hpp +++ b/include/skyr/unicode/code_point.hpp @@ -7,6 +7,7 @@ #define SKYR_UNICODE_CODE_POINT_HPP #include + #include #include #include diff --git a/include/skyr/unicode/code_points/u16.hpp b/include/skyr/unicode/code_points/u16.hpp index 378c7f545..b5d90cf75 100644 --- a/include/skyr/unicode/code_points/u16.hpp +++ b/include/skyr/unicode/code_points/u16.hpp @@ -6,10 +6,11 @@ #ifndef SKYR_UNICODE_CODE_POINTS_U16_HPP #define SKYR_UNICODE_CODE_POINTS_U16_HPP +#include + #include #include #include -#include namespace skyr::unicode { /// diff --git a/include/skyr/unicode/code_points/u8.hpp b/include/skyr/unicode/code_points/u8.hpp index b01f285fb..c6c76bd64 100644 --- a/include/skyr/unicode/code_points/u8.hpp +++ b/include/skyr/unicode/code_points/u8.hpp @@ -6,11 +6,12 @@ #ifndef SKYR_UNICODE_CODE_POINTS_U8_HPP #define SKYR_UNICODE_CODE_POINTS_U8_HPP +#include + #include #include #include #include -#include namespace skyr::unicode { /// This class defines a view over a code point in raw bytes, diff --git a/include/skyr/unicode/core.hpp b/include/skyr/unicode/core.hpp index f7db5643a..029d52730 100644 --- a/include/skyr/unicode/core.hpp +++ b/include/skyr/unicode/core.hpp @@ -6,10 +6,11 @@ #ifndef SKYR_UNICODE_CORE_HPP #define SKYR_UNICODE_CORE_HPP -#include -#include #include #include +#include +#include + #include #include diff --git a/include/skyr/unicode/details/to_u8.hpp b/include/skyr/unicode/details/to_u8.hpp index cdea9cfe1..3957fbfda 100644 --- a/include/skyr/unicode/details/to_u8.hpp +++ b/include/skyr/unicode/details/to_u8.hpp @@ -7,10 +7,11 @@ #define SKYR_UNICODE_DETAILS_TO_U8_HPP #include + #include +#include #include #include -#include namespace skyr::details { template diff --git a/include/skyr/unicode/ranges/transforms/u16_transform.hpp b/include/skyr/unicode/ranges/transforms/u16_transform.hpp index fb4b4681a..7a98edd7d 100644 --- a/include/skyr/unicode/ranges/transforms/u16_transform.hpp +++ b/include/skyr/unicode/ranges/transforms/u16_transform.hpp @@ -6,14 +6,15 @@ #ifndef SKYR_UNICODE_RANGES_TRANSFORMS_U16_TRANSFORM_HPP #define SKYR_UNICODE_RANGES_TRANSFORMS_U16_TRANSFORM_HPP +#include #include #include -#include + +#include #include #include -#include -#include #include +#include #include namespace skyr::unicode { diff --git a/include/skyr/unicode/ranges/transforms/u32_transform.hpp b/include/skyr/unicode/ranges/transforms/u32_transform.hpp index 0345eeffd..9520dc0ae 100644 --- a/include/skyr/unicode/ranges/transforms/u32_transform.hpp +++ b/include/skyr/unicode/ranges/transforms/u32_transform.hpp @@ -6,9 +6,10 @@ #ifndef SKYR_UNICODE_RANGES_TRANSFORMS_U32_TRANSFORM_HPP #define SKYR_UNICODE_RANGES_TRANSFORMS_U32_TRANSFORM_HPP +#include #include #include -#include + #include #include #include diff --git a/include/skyr/unicode/ranges/transforms/u8_transform.hpp b/include/skyr/unicode/ranges/transforms/u8_transform.hpp index 835a81f77..78b35e451 100644 --- a/include/skyr/unicode/ranges/transforms/u8_transform.hpp +++ b/include/skyr/unicode/ranges/transforms/u8_transform.hpp @@ -6,11 +6,12 @@ #ifndef SKYR_UNICODE_RANGES_TRANSFORMS_U8_TRANSFORM_HPP #define SKYR_UNICODE_RANGES_TRANSFORMS_U8_TRANSFORM_HPP -#include #include +#include + +#include #include #include -#include #include #include diff --git a/include/skyr/unicode/ranges/views/u16_view.hpp b/include/skyr/unicode/ranges/views/u16_view.hpp index eeb1d950e..c187918cd 100644 --- a/include/skyr/unicode/ranges/views/u16_view.hpp +++ b/include/skyr/unicode/ranges/views/u16_view.hpp @@ -7,12 +7,13 @@ #define SKYR_UNICODE_RANGES_VIEWS_U16_VIEW_HPP #include +#include #include #include -#include + +#include #include #include -#include #include #include #include diff --git a/include/skyr/unicode/ranges/views/u8_view.hpp b/include/skyr/unicode/ranges/views/u8_view.hpp index 2f5c060fd..ba2fff7ad 100644 --- a/include/skyr/unicode/ranges/views/u8_view.hpp +++ b/include/skyr/unicode/ranges/views/u8_view.hpp @@ -6,9 +6,10 @@ #ifndef SKYR_UNICODE_RANGES_VIEWS_U8_VIEW_HPP #define SKYR_UNICODE_RANGES_VIEWS_U8_VIEW_HPP +#include #include #include -#include + #include #include #include diff --git a/include/skyr/unicode/ranges/views/unchecked_u8_view.hpp b/include/skyr/unicode/ranges/views/unchecked_u8_view.hpp index 8cdf591b2..9e501b0f7 100644 --- a/include/skyr/unicode/ranges/views/unchecked_u8_view.hpp +++ b/include/skyr/unicode/ranges/views/unchecked_u8_view.hpp @@ -6,15 +6,16 @@ #ifndef SKYR_UNICODE_RANGES_VIEWS_UNCHECKED_U8_VIEW_HPP #define SKYR_UNICODE_RANGES_VIEWS_UNCHECKED_U8_VIEW_HPP -#include #include #include #include +#include + #include #include #include -#include #include +#include namespace skyr::unicode { /// diff --git a/include/skyr/url.hpp b/include/skyr/url.hpp index 290f8c652..ea2f568ac 100644 --- a/include/skyr/url.hpp +++ b/include/skyr/url.hpp @@ -6,22 +6,23 @@ #ifndef SKYR_URL_HPP #define SKYR_URL_HPP +#include #include #include #include #include -#include + #include -#include -#include -#include -#include -#include #include -#include -#include #include #include +#include +#include +#include +#include +#include +#include +#include #include #if defined(SKYR_PLATFORM_MSVC) diff --git a/include/skyr/url_search_parameters.hpp b/include/skyr/url_search_parameters.hpp index 330003709..9aeed350e 100644 --- a/include/skyr/url_search_parameters.hpp +++ b/include/skyr/url_search_parameters.hpp @@ -6,17 +6,18 @@ #ifndef SKYR_URL_SEARCH_PARAMETERS_HPP #define SKYR_URL_SEARCH_PARAMETERS_HPP -#include -#include -#include -#include -#include #include #include #include +#include +#include +#include +#include +#include + #include -#include #include +#include namespace skyr { class url; diff --git a/tests/skyr/allocations/allocations.hpp b/tests/skyr/allocations/allocations.hpp index a2c988b39..d38ccd885 100644 --- a/tests/skyr/allocations/allocations.hpp +++ b/tests/skyr/allocations/allocations.hpp @@ -6,10 +6,10 @@ #ifndef SKYR_ALLOCATIONS_HPP #define SKYR_ALLOCATIONS_HPP -#include #include -#include #include +#include +#include auto num_allocations = std::optional{}; diff --git a/tests/skyr/allocations/host_parsing_tests.cpp b/tests/skyr/allocations/host_parsing_tests.cpp index 7a00b372f..eb52ecc2b 100644 --- a/tests/skyr/allocations/host_parsing_tests.cpp +++ b/tests/skyr/allocations/host_parsing_tests.cpp @@ -3,16 +3,14 @@ // (See accompanying file LICENSE_1_0.txt of copy at // http://www.boost.org/LICENSE_1_0.txt) +#include "allocations.hpp" + #include #include -#include #include -#include #include -#include + #include -#include -#include "allocations.hpp" using namespace std::string_view_literals; diff --git a/tests/skyr/containers/static_vector_tests.cpp b/tests/skyr/containers/static_vector_tests.cpp index c3c8f9312..6ebd03001 100644 --- a/tests/skyr/containers/static_vector_tests.cpp +++ b/tests/skyr/containers/static_vector_tests.cpp @@ -5,7 +5,9 @@ #include #include + #include + #include struct test_destructor_call { diff --git a/tests/skyr/core/parse_host_tests.cpp b/tests/skyr/core/parse_host_tests.cpp index 3eb8d63af..bd95bb8bf 100644 --- a/tests/skyr/core/parse_host_tests.cpp +++ b/tests/skyr/core/parse_host_tests.cpp @@ -5,11 +5,10 @@ #include #include -#include #include -#include + #include -#include + #include TEST_CASE("parse_host_tests", "url.parse_host") { diff --git a/tests/skyr/core/parse_path_tests.cpp b/tests/skyr/core/parse_path_tests.cpp index 4f6e65b2e..6f655dbad 100644 --- a/tests/skyr/core/parse_path_tests.cpp +++ b/tests/skyr/core/parse_path_tests.cpp @@ -4,8 +4,9 @@ // http://www.boost.org/LICENSE_1_0.txt) #include + #include -#include + #include TEST_CASE("path_parsing_example_tests", "[parse]") { diff --git a/tests/skyr/core/parse_query_tests.cpp b/tests/skyr/core/parse_query_tests.cpp index 0a5ab1457..983780e69 100644 --- a/tests/skyr/core/parse_query_tests.cpp +++ b/tests/skyr/core/parse_query_tests.cpp @@ -4,8 +4,9 @@ // http://www.boost.org/LICENSE_1_0.txt) #include + #include -#include + #include TEST_CASE("query_parsing_example_tests", "[parse]") { diff --git a/tests/skyr/core/url_parse_tests.cpp b/tests/skyr/core/url_parse_tests.cpp index c6c2a6d56..d60a63a87 100644 --- a/tests/skyr/core/url_parse_tests.cpp +++ b/tests/skyr/core/url_parse_tests.cpp @@ -4,10 +4,10 @@ // http://www.boost.org/LICENSE_1_0.txt) #include + #include -#include + #include -#include #include /// https://url.spec.whatwg.org/#example-url-parsing diff --git a/tests/skyr/core/url_serialize_tests.cpp b/tests/skyr/core/url_serialize_tests.cpp index 48ce92f37..6543b864f 100644 --- a/tests/skyr/core/url_serialize_tests.cpp +++ b/tests/skyr/core/url_serialize_tests.cpp @@ -4,10 +4,10 @@ // http://www.boost.org/LICENSE_1_0.txt) #include + #include -#include + #include -#include #include TEST_CASE("url_serialize_tests", "[ipv6]") { diff --git a/tests/skyr/domain/domain_tests.cpp b/tests/skyr/domain/domain_tests.cpp index 76512b59b..22c92368d 100644 --- a/tests/skyr/domain/domain_tests.cpp +++ b/tests/skyr/domain/domain_tests.cpp @@ -5,11 +5,10 @@ #include #include -#include + #include -#include + #include -#include #include TEST_CASE("valid domains to ascii", "[domain]") { diff --git a/tests/skyr/domain/idna_table_tests.cpp b/tests/skyr/domain/idna_table_tests.cpp index 1b4cbc3d1..9026e92c0 100644 --- a/tests/skyr/domain/idna_table_tests.cpp +++ b/tests/skyr/domain/idna_table_tests.cpp @@ -4,8 +4,9 @@ // http://www.boost.org/LICENSE_1_0.txt) #include + #include -#include + #include struct parameter { diff --git a/tests/skyr/domain/punycode_tests.cpp b/tests/skyr/domain/punycode_tests.cpp index 554a47242..f9b6ca221 100644 --- a/tests/skyr/domain/punycode_tests.cpp +++ b/tests/skyr/domain/punycode_tests.cpp @@ -5,9 +5,9 @@ #include #include -#include + #include -#include + #include TEST_CASE("encode_test", "[punycode]") { diff --git a/tests/skyr/filesystem/filesystem_path_tests.cpp b/tests/skyr/filesystem/filesystem_path_tests.cpp index 7e1006a79..109f4ed57 100644 --- a/tests/skyr/filesystem/filesystem_path_tests.cpp +++ b/tests/skyr/filesystem/filesystem_path_tests.cpp @@ -4,11 +4,11 @@ // http://www.boost.org/LICENSE_1_0.txt) #include + #include -#include -#include -#include + #include +#include TEST_CASE("filesystem path", "[filesystem_path]") { SECTION("empty_path") { diff --git a/tests/skyr/json/json_query_tests.cpp b/tests/skyr/json/json_query_tests.cpp index 0bb64183b..00acb2be1 100644 --- a/tests/skyr/json/json_query_tests.cpp +++ b/tests/skyr/json/json_query_tests.cpp @@ -3,11 +3,11 @@ // (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) -#include -#include #include #include -#include + +#include + #include TEST_CASE("json_tests", "[json.query]") { diff --git a/tests/skyr/network/ipv4_address_tests.cpp b/tests/skyr/network/ipv4_address_tests.cpp index 6154c6ec5..642e4c43d 100644 --- a/tests/skyr/network/ipv4_address_tests.cpp +++ b/tests/skyr/network/ipv4_address_tests.cpp @@ -4,8 +4,9 @@ // http://www.boost.org/LICENSE_1_0.txt) #include + #include -#include + #include TEST_CASE("ipv4 addresses", "[ipv4]") { diff --git a/tests/skyr/network/ipv6_address_tests.cpp b/tests/skyr/network/ipv6_address_tests.cpp index 0694f2e6c..e580f1f34 100644 --- a/tests/skyr/network/ipv6_address_tests.cpp +++ b/tests/skyr/network/ipv6_address_tests.cpp @@ -4,8 +4,9 @@ // http://www.boost.org/LICENSE_1_0.txt) #include + #include -#include + #include TEST_CASE("ipv6_address_tests", "[ipv6]") { diff --git a/tests/skyr/percent_encoding/percent_decoding_tests.cpp b/tests/skyr/percent_encoding/percent_decoding_tests.cpp index df7bbfe35..cf62d5c23 100644 --- a/tests/skyr/percent_encoding/percent_decoding_tests.cpp +++ b/tests/skyr/percent_encoding/percent_decoding_tests.cpp @@ -4,11 +4,12 @@ // http://www.boost.org/LICENSE_1_0.txt) #include + #include #define FMT_HEADER_ONLY #include #include -#include + #include TEST_CASE("percent_decode", "[percent_decode]") { diff --git a/tests/skyr/percent_encoding/percent_encoding_tests.cpp b/tests/skyr/percent_encoding/percent_encoding_tests.cpp index 48448341c..a6515a4c9 100644 --- a/tests/skyr/percent_encoding/percent_encoding_tests.cpp +++ b/tests/skyr/percent_encoding/percent_encoding_tests.cpp @@ -4,11 +4,12 @@ // http://www.boost.org/LICENSE_1_0.txt) #include + #include #define FMT_HEADER_ONLY #include #include -#include + #include TEST_CASE("encode fragment", "[percent_encoding]") { diff --git a/tests/skyr/unicode/byte_conversion_tests.cpp b/tests/skyr/unicode/byte_conversion_tests.cpp index 76c37c498..140378426 100644 --- a/tests/skyr/unicode/byte_conversion_tests.cpp +++ b/tests/skyr/unicode/byte_conversion_tests.cpp @@ -5,9 +5,9 @@ #include #include -#include + #include -#include + #include TEST_CASE("weird_01", "byte_conversion_tests") { diff --git a/tests/skyr/unicode/unicode_code_point_tests.cpp b/tests/skyr/unicode/unicode_code_point_tests.cpp index b9fac319b..ea30dc58d 100644 --- a/tests/skyr/unicode/unicode_code_point_tests.cpp +++ b/tests/skyr/unicode/unicode_code_point_tests.cpp @@ -5,11 +5,10 @@ #include #include -#include #include -#include + #include -#include + #include TEST_CASE("u8 code point tests") { diff --git a/tests/skyr/unicode/unicode_range_tests.cpp b/tests/skyr/unicode/unicode_range_tests.cpp index f607179c8..7c48cfc27 100644 --- a/tests/skyr/unicode/unicode_range_tests.cpp +++ b/tests/skyr/unicode/unicode_range_tests.cpp @@ -5,19 +5,14 @@ #include #include -#include #include -#include + #include -#include + #include -#include #include -#include #include -#include #include -#include #include namespace unicode = skyr::unicode; diff --git a/tests/skyr/unicode/unicode_tests.cpp b/tests/skyr/unicode/unicode_tests.cpp index 5a87b57a0..7e32acf1d 100644 --- a/tests/skyr/unicode/unicode_tests.cpp +++ b/tests/skyr/unicode/unicode_tests.cpp @@ -4,19 +4,15 @@ // http://www.boost.org/LICENSE_1_0.txt) #include +#include + #include -#include + #include -#include #include -#include #include -#include #include -#include #include -#include -#include TEST_CASE("unicode_tests", "[unicode]") { using namespace std::string_literals; diff --git a/tests/skyr/url/url_literal_tests.cpp b/tests/skyr/url/url_literal_tests.cpp index 0a6729abd..ea77b4708 100644 --- a/tests/skyr/url/url_literal_tests.cpp +++ b/tests/skyr/url/url_literal_tests.cpp @@ -3,13 +3,12 @@ // (See accompanying file LICENSE_1_0.txt of copy at // http://www.boost.org/LICENSE_1_0.txt) -#include #include #include #include -#include + #include -#include + #include using namespace skyr::literals; diff --git a/tests/skyr/url/url_search_parameters_tests.cpp b/tests/skyr/url/url_search_parameters_tests.cpp index 41502b984..bebea905d 100644 --- a/tests/skyr/url/url_search_parameters_tests.cpp +++ b/tests/skyr/url/url_search_parameters_tests.cpp @@ -4,10 +4,10 @@ // http://www.boost.org/LICENSE_1_0.txt) #include + #include -#include + #include -#include #include TEST_CASE("url_search_parameters_test", "[url_search_parameters]") { diff --git a/tests/skyr/url/url_setter_tests.cpp b/tests/skyr/url/url_setter_tests.cpp index 944a20f27..e67bafffb 100644 --- a/tests/skyr/url/url_setter_tests.cpp +++ b/tests/skyr/url/url_setter_tests.cpp @@ -4,8 +4,9 @@ // http://www.boost.org/LICENSE_1_0.txt) #include + #include -#include + #include TEST_CASE("url_setter_tests", "[url]") { diff --git a/tests/skyr/url/url_tests.cpp b/tests/skyr/url/url_tests.cpp index aaa0c3d56..940bad9c0 100644 --- a/tests/skyr/url/url_tests.cpp +++ b/tests/skyr/url/url_tests.cpp @@ -5,13 +5,12 @@ // (See accompanying file LICENSE_1_0.txt of copy at // http://www.boost.org/LICENSE_1_0.txt) -#include #include #include #include -#include + #include -#include + #include TEST_CASE("url_tests", "[url]") { diff --git a/tests/skyr/url/url_tests_with_exceptions.cpp b/tests/skyr/url/url_tests_with_exceptions.cpp index 9225089b7..7da38ddf6 100644 --- a/tests/skyr/url/url_tests_with_exceptions.cpp +++ b/tests/skyr/url/url_tests_with_exceptions.cpp @@ -5,13 +5,12 @@ // (See accompanying file LICENSE_1_0.txt of copy at // http://www.boost.org/LICENSE_1_0.txt) -#include #include #include #include -#include + #include -#include + #include TEST_CASE("url_tests", "[url]") { diff --git a/tests/skyr/url/url_vector_tests.cpp b/tests/skyr/url/url_vector_tests.cpp index 0084cfa89..a87285812 100644 --- a/tests/skyr/url/url_vector_tests.cpp +++ b/tests/skyr/url/url_vector_tests.cpp @@ -5,9 +5,9 @@ #include #include -#include + #include -#include + #include TEST_CASE("url_vector_tests", "[url]") {