diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 02171f60..e91364ac 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -47,7 +47,7 @@ repos: - id: end-of-file-fixer - id: check-shebang-scripts-are-executable - repo: https://github.com/pre-commit/mirrors-clang-format - rev: v17.0.6 + rev: v18.1.1 hooks: - id: clang-format types: diff --git a/units/unit_definitions.hpp b/units/unit_definitions.hpp index e90cf311..676e9354 100644 --- a/units/unit_definitions.hpp +++ b/units/unit_definitions.hpp @@ -852,8 +852,8 @@ namespace precise { return ((static_cast(val >> bit) & 0x1U) > 0U) ? 1 : 0; } - constexpr auto bShiftu(std::uint16_t val, std::uint32_t bit) - -> unsigned int + constexpr auto + bShiftu(std::uint16_t val, std::uint32_t bit) -> unsigned int { return ((static_cast(val >> bit) & 0x1U) > 0U) ? 1U : 0U; diff --git a/units/units.hpp b/units/units.hpp index c4625baa..311d4d70 100644 --- a/units/units.hpp +++ b/units/units.hpp @@ -742,17 +742,14 @@ class uncertain_measurement { float val, float uncertainty_val, const unit& base) noexcept : - value_(val), - uncertainty_(uncertainty_val), units_(base) + value_(val), uncertainty_(uncertainty_val), units_(base) { } /// construct from a single precision value, and unit assume uncertainty is /// 0 explicit constexpr uncertain_measurement( float val, - const unit& base) noexcept : - value_(val), - units_(base) + const unit& base) noexcept : value_(val), units_(base) { } @@ -761,16 +758,15 @@ class uncertain_measurement { explicit constexpr uncertain_measurement( double val, const unit& base) noexcept : - value_(static_cast(val)), - units_(base) + value_(static_cast(val)), units_(base) { } /// construct from a regular measurement and uncertainty value explicit constexpr uncertain_measurement( const measurement& val, float uncertainty_val) noexcept : - value_(static_cast(val.value())), - uncertainty_(uncertainty_val), units_(val.units()) + value_(static_cast(val.value())), uncertainty_(uncertainty_val), + units_(val.units()) { } /// construct from a regular measurement and an uncertainty measurement @@ -1417,22 +1413,19 @@ class fixed_precise_measurement { explicit constexpr fixed_precise_measurement( const precise_measurement& val) : - value_(val.value()), - units_(val.units()) + value_(val.value()), units_(val.units()) { } constexpr fixed_precise_measurement( const fixed_precise_measurement& val) noexcept : - value_(val.value()), - units_(val.units()) + value_(val.value()), units_(val.units()) { } constexpr fixed_precise_measurement( fixed_precise_measurement&& val) noexcept : - value_(val.value()), - units_(val.units()) + value_(val.value()), units_(val.units()) { } diff --git a/units/units_decl.hpp b/units/units_decl.hpp index f043a6c8..27141e7a 100644 --- a/units/units_decl.hpp +++ b/units/units_decl.hpp @@ -113,11 +113,10 @@ namespace detail { unsigned int iflag, unsigned int eflag, unsigned int equation) : - meter_(meters), - second_(seconds), kilogram_(kilograms), ampere_(amperes), - candela_(candelas), kelvin_(kelvins), mole_(moles), - radians_(radians), currency_(currencys), count_(counts), - per_unit_(per_unit), i_flag_(iflag), e_flag_(eflag), + meter_(meters), second_(seconds), kilogram_(kilograms), + ampere_(amperes), candela_(candelas), kelvin_(kelvins), + mole_(moles), radians_(radians), currency_(currencys), + count_(counts), per_unit_(per_unit), i_flag_(iflag), e_flag_(eflag), equation_(equation) { } @@ -780,8 +779,7 @@ class precise_unit { // NOLINTNEXTLINE(modernize-use-equals-default) constexpr precise_unit() noexcept {}; explicit constexpr precise_unit(const detail::unit_data& base_unit) noexcept - : - base_units_(base_unit) + : base_units_(base_unit) { } @@ -789,8 +787,7 @@ class precise_unit { constexpr precise_unit( double mult, const detail::unit_data& base_unit) noexcept : - multiplier_(mult), - base_units_(base_unit) + multiplier_(mult), base_units_(base_unit) { } @@ -799,8 +796,7 @@ class precise_unit { double mult, const detail::unit_data& base_unit, std::uint32_t commodity_code) noexcept : - multiplier_(mult), - base_units_(base_unit), commodity_(commodity_code) + multiplier_(mult), base_units_(base_unit), commodity_(commodity_code) { } @@ -808,8 +804,7 @@ class precise_unit { explicit constexpr precise_unit( const detail::unit_data& base_unit, std::uint32_t commodity_code) noexcept : - base_units_(base_unit), - commodity_(commodity_code) + base_units_(base_unit), commodity_(commodity_code) { } diff --git a/webserver/unit_web_server.cpp b/webserver/unit_web_server.cpp index 74a133ea..5de7ae9b 100644 --- a/webserver/unit_web_server.cpp +++ b/webserver/unit_web_server.cpp @@ -244,26 +244,28 @@ void handle_request( }; // generate a conversion response - auto const html_response = [&req]( - const std::string& html_page, - const std::vector< - std::pair>& - substitutions) { - http::response res{http::status::ok, req.version()}; - res.set(http::field::server, "UNITS WEB SERVER" UNITS_VERSION_STRING); - res.set(http::field::content_type, "text/html"); - res.keep_alive(req.keep_alive()); - auto resp = html_page; - string_substitution(resp, substitutions); - - if (req.method() != http::verb::head) { - res.body() = resp; - res.prepare_payload(); - } else { - res.content_length(resp.size()); - } - return res; - }; + auto const html_response = + [&req]( + const std::string& html_page, + const std::vector>& + substitutions) { + http::response res{ + http::status::ok, req.version()}; + res.set( + http::field::server, "UNITS WEB SERVER" UNITS_VERSION_STRING); + res.set(http::field::content_type, "text/html"); + res.keep_alive(req.keep_alive()); + auto resp = html_page; + string_substitution(resp, substitutions); + + if (req.method() != http::verb::head) { + res.body() = resp; + res.prepare_payload(); + } else { + res.content_length(resp.size()); + } + return res; + }; // generate a conversion response auto const trivial_response = [&req](const std::string& value) { http::response res{http::status::ok, req.version()}; @@ -280,27 +282,29 @@ void handle_request( }; // generate a conversion response - auto const json_response = [&req]( - const std::string& json_string, - const std::vector< - std::pair>& - substitutions) { - http::response res{http::status::ok, req.version()}; - res.set(http::field::server, "UNITS WEB SERVER" UNITS_VERSION_STRING); - res.set(http::field::content_type, "application/json"); - res.keep_alive(req.keep_alive()); - auto resp = json_string; - string_substitution(resp, substitutions); - - if (req.method() != http::verb::head) { - res.body() = resp; - res.prepare_payload(); - } else { - res.content_length(resp.size()); - } + auto const json_response = + [&req]( + const std::string& json_string, + const std::vector>& + substitutions) { + http::response res{ + http::status::ok, req.version()}; + res.set( + http::field::server, "UNITS WEB SERVER" UNITS_VERSION_STRING); + res.set(http::field::content_type, "application/json"); + res.keep_alive(req.keep_alive()); + auto resp = json_string; + string_substitution(resp, substitutions); + + if (req.method() != http::verb::head) { + res.body() = resp; + res.prepare_payload(); + } else { + res.content_length(resp.size()); + } - return res; - }; + return res; + }; ++request_count; switch (req.method()) {