Upgrade ClangFormat to v19.1.0 (#808)

Signed-off-by: Juan Cruz Viotti <[email protected]>
sourcemeta · Sep 23, 2024 · df1d2e4 · df1d2e4
1 parent 13f0ff3
commit df1d2e4
Show file tree

Hide file tree

Showing 23 changed files with 115 additions and 110 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -62,7 +62,7 @@ jobs:
       CXX: ${{ matrix.platform.cxx }}
     steps:
       - name: Install ClangFormat
-        run: pip install clang-format==18.1.5
+        run: pip install clang-format==19.1.0
 
       - uses: actions/checkout@v3
       - name: Install dependencies (macOS)

diff --git a/src/cli/command_canonicalize.cc b/src/cli/command_canonicalize.cc
@@ -9,8 +9,8 @@
 #include <filesystem> // std::filesystem
 #include <iostream>   // std::cin, std::cout, std::endl;
 
-static auto
-canonicalize_from_json(sourcemeta::jsontoolkit::JSON &schema) -> int {
+static auto canonicalize_from_json(sourcemeta::jsontoolkit::JSON &schema)
+    -> int {
   sourcemeta::jsonbinpack::canonicalize(
       schema, sourcemeta::jsontoolkit::default_schema_walker,
       sourcemeta::jsontoolkit::official_resolver,

diff --git a/src/cli/command_decode.cc b/src/cli/command_decode.cc
@@ -15,9 +15,9 @@
 #include <istream>    // std::basic_istream
 
 template <typename CharT, typename Traits>
-static auto
-decode_from_stream(sourcemeta::jsontoolkit::JSON &schema,
-                   std::basic_istream<CharT, Traits> &stream) -> int {
+static auto decode_from_stream(sourcemeta::jsontoolkit::JSON &schema,
+                               std::basic_istream<CharT, Traits> &stream)
+    -> int {
   sourcemeta::jsonbinpack::compile(
       schema, sourcemeta::jsontoolkit::default_schema_walker,
       sourcemeta::jsontoolkit::official_resolver,

diff --git a/src/cli/command_encode.cc b/src/cli/command_encode.cc
@@ -11,9 +11,9 @@
 #include <filesystem> // std::filesystem
 #include <iostream>   // std::cin, std::cout
 
-static auto
-encode_from_json(sourcemeta::jsontoolkit::JSON &schema,
-                 const sourcemeta::jsontoolkit::JSON &instance) -> int {
+static auto encode_from_json(sourcemeta::jsontoolkit::JSON &schema,
+                             const sourcemeta::jsontoolkit::JSON &instance)
+    -> int {
   sourcemeta::jsonbinpack::compile(
       schema, sourcemeta::jsontoolkit::default_schema_walker,
       sourcemeta::jsontoolkit::official_resolver,

diff --git a/src/cli/main.cc b/src/cli/main.cc
@@ -8,10 +8,10 @@
 #include <stdexcept> // std::runtime_error
 #include <vector>    // std::vector
 
-static auto
-assert_arguments(const std::string &command,
-                 const std::vector<std::string> &arguments,
-                 const std::vector<std::string>::size_type count) -> void {
+static auto assert_arguments(const std::string &command,
+                             const std::vector<std::string> &arguments,
+                             const std::vector<std::string>::size_type count)
+    -> void {
   if (arguments.size() >= count) {
     return;
   }

diff --git a/src/compiler/mapper_rules/enum_singleton.h b/src/compiler/mapper_rules/enum_singleton.h
@@ -2,11 +2,11 @@ class EnumSingleton final : public sourcemeta::alterschema::Rule {
 public:
   EnumSingleton() : sourcemeta::alterschema::Rule("enum_singleton", "TODO") {};
 
-  [[nodiscard]] auto
-  condition(const sourcemeta::jsontoolkit::JSON &schema,
-            const std::string &dialect,
-            const std::set<std::string> &vocabularies,
-            const sourcemeta::jsontoolkit::Pointer &) const -> bool override {
+  [[nodiscard]] auto condition(const sourcemeta::jsontoolkit::JSON &schema,
+                               const std::string &dialect,
+                               const std::set<std::string> &vocabularies,
+                               const sourcemeta::jsontoolkit::Pointer &) const
+      -> bool override {
     return !is_encoding(schema) &&
            dialect == "https://json-schema.org/draft/2020-12/schema" &&
            vocabularies.contains(

diff --git a/src/compiler/mapper_rules/integer_bounded_8_bit.h b/src/compiler/mapper_rules/integer_bounded_8_bit.h
@@ -3,11 +3,11 @@ class IntegerBounded8Bit final : public sourcemeta::alterschema::Rule {
   IntegerBounded8Bit()
       : sourcemeta::alterschema::Rule("integer_bounded_8_bit", "TODO") {};
 
-  [[nodiscard]] auto
-  condition(const sourcemeta::jsontoolkit::JSON &schema,
-            const std::string &dialect,
-            const std::set<std::string> &vocabularies,
-            const sourcemeta::jsontoolkit::Pointer &) const -> bool override {
+  [[nodiscard]] auto condition(const sourcemeta::jsontoolkit::JSON &schema,
+                               const std::string &dialect,
+                               const std::set<std::string> &vocabularies,
+                               const sourcemeta::jsontoolkit::Pointer &) const
+      -> bool override {
     return !is_encoding(schema) &&
            dialect == "https://json-schema.org/draft/2020-12/schema" &&
            vocabularies.contains(

diff --git a/src/compiler/mapper_rules/integer_bounded_greater_than_8_bit.h b/src/compiler/mapper_rules/integer_bounded_greater_than_8_bit.h
@@ -5,11 +5,11 @@ class IntegerBoundedGreaterThan8Bit final
       : sourcemeta::alterschema::Rule("integer_bounded_greater_than_8_bit",
                                       "TODO") {};
 
-  [[nodiscard]] auto
-  condition(const sourcemeta::jsontoolkit::JSON &schema,
-            const std::string &dialect,
-            const std::set<std::string> &vocabularies,
-            const sourcemeta::jsontoolkit::Pointer &) const -> bool override {
+  [[nodiscard]] auto condition(const sourcemeta::jsontoolkit::JSON &schema,
+                               const std::string &dialect,
+                               const std::set<std::string> &vocabularies,
+                               const sourcemeta::jsontoolkit::Pointer &) const
+      -> bool override {
     return !is_encoding(schema) &&
            dialect == "https://json-schema.org/draft/2020-12/schema" &&
            vocabularies.contains(

diff --git a/src/compiler/mapper_rules/integer_bounded_multiplier_8_bit.h b/src/compiler/mapper_rules/integer_bounded_multiplier_8_bit.h
@@ -5,11 +5,11 @@ class IntegerBoundedMultiplier8Bit final
       : sourcemeta::alterschema::Rule("integer_bounded_multiplier_8_bit",
                                       "TODO") {};
 
-  [[nodiscard]] auto
-  condition(const sourcemeta::jsontoolkit::JSON &schema,
-            const std::string &dialect,
-            const std::set<std::string> &vocabularies,
-            const sourcemeta::jsontoolkit::Pointer &) const -> bool override {
+  [[nodiscard]] auto condition(const sourcemeta::jsontoolkit::JSON &schema,
+                               const std::string &dialect,
+                               const std::set<std::string> &vocabularies,
+                               const sourcemeta::jsontoolkit::Pointer &) const
+      -> bool override {
     if (is_encoding(schema) ||
         dialect != "https://json-schema.org/draft/2020-12/schema" ||
         !vocabularies.contains(

diff --git a/src/compiler/mapper_rules/integer_bounded_multiplier_greater_than_8_bit.h b/src/compiler/mapper_rules/integer_bounded_multiplier_greater_than_8_bit.h
@@ -5,11 +5,11 @@ class IntegerBoundedMultiplierGreaterThan8Bit final
       : sourcemeta::alterschema::Rule(
             "integer_bounded_multiplier_greater_than_8_bit", "TODO") {};
 
-  [[nodiscard]] auto
-  condition(const sourcemeta::jsontoolkit::JSON &schema,
-            const std::string &dialect,
-            const std::set<std::string> &vocabularies,
-            const sourcemeta::jsontoolkit::Pointer &) const -> bool override {
+  [[nodiscard]] auto condition(const sourcemeta::jsontoolkit::JSON &schema,
+                               const std::string &dialect,
+                               const std::set<std::string> &vocabularies,
+                               const sourcemeta::jsontoolkit::Pointer &) const
+      -> bool override {
     if (is_encoding(schema) ||
         dialect != "https://json-schema.org/draft/2020-12/schema" ||
         !vocabularies.contains(

diff --git a/src/compiler/mapper_rules/integer_lower_bound.h b/src/compiler/mapper_rules/integer_lower_bound.h
@@ -3,11 +3,11 @@ class IntegerLowerBound final : public sourcemeta::alterschema::Rule {
   IntegerLowerBound()
       : sourcemeta::alterschema::Rule("integer_lower_bound", "TODO") {};
 
-  [[nodiscard]] auto
-  condition(const sourcemeta::jsontoolkit::JSON &schema,
-            const std::string &dialect,
-            const std::set<std::string> &vocabularies,
-            const sourcemeta::jsontoolkit::Pointer &) const -> bool override {
+  [[nodiscard]] auto condition(const sourcemeta::jsontoolkit::JSON &schema,
+                               const std::string &dialect,
+                               const std::set<std::string> &vocabularies,
+                               const sourcemeta::jsontoolkit::Pointer &) const
+      -> bool override {
     return !is_encoding(schema) &&
            dialect == "https://json-schema.org/draft/2020-12/schema" &&
            vocabularies.contains(

diff --git a/src/compiler/mapper_rules/integer_lower_bound_multiplier.h b/src/compiler/mapper_rules/integer_lower_bound_multiplier.h
@@ -4,11 +4,11 @@ class IntegerLowerBoundMultiplier final : public sourcemeta::alterschema::Rule {
       : sourcemeta::alterschema::Rule("integer_lower_bound_multiplier",
                                       "TODO") {};
 
-  [[nodiscard]] auto
-  condition(const sourcemeta::jsontoolkit::JSON &schema,
-            const std::string &dialect,
-            const std::set<std::string> &vocabularies,
-            const sourcemeta::jsontoolkit::Pointer &) const -> bool override {
+  [[nodiscard]] auto condition(const sourcemeta::jsontoolkit::JSON &schema,
+                               const std::string &dialect,
+                               const std::set<std::string> &vocabularies,
+                               const sourcemeta::jsontoolkit::Pointer &) const
+      -> bool override {
     return !is_encoding(schema) &&
            dialect == "https://json-schema.org/draft/2020-12/schema" &&
            vocabularies.contains(

diff --git a/src/compiler/mapper_rules/integer_unbound.h b/src/compiler/mapper_rules/integer_unbound.h
@@ -3,11 +3,11 @@ class IntegerUnbound final : public sourcemeta::alterschema::Rule {
   IntegerUnbound()
       : sourcemeta::alterschema::Rule("integer_unbound", "TODO") {};
 
-  [[nodiscard]] auto
-  condition(const sourcemeta::jsontoolkit::JSON &schema,
-            const std::string &dialect,
-            const std::set<std::string> &vocabularies,
-            const sourcemeta::jsontoolkit::Pointer &) const -> bool override {
+  [[nodiscard]] auto condition(const sourcemeta::jsontoolkit::JSON &schema,
+                               const std::string &dialect,
+                               const std::set<std::string> &vocabularies,
+                               const sourcemeta::jsontoolkit::Pointer &) const
+      -> bool override {
     return !is_encoding(schema) &&
            dialect == "https://json-schema.org/draft/2020-12/schema" &&
            vocabularies.contains(

diff --git a/src/compiler/mapper_rules/integer_unbound_multiplier.h b/src/compiler/mapper_rules/integer_unbound_multiplier.h
@@ -3,11 +3,11 @@ class IntegerUnboundMultiplier final : public sourcemeta::alterschema::Rule {
   IntegerUnboundMultiplier()
       : sourcemeta::alterschema::Rule("integer_unbound_multiplier", "TODO") {};
 
-  [[nodiscard]] auto
-  condition(const sourcemeta::jsontoolkit::JSON &schema,
-            const std::string &dialect,
-            const std::set<std::string> &vocabularies,
-            const sourcemeta::jsontoolkit::Pointer &) const -> bool override {
+  [[nodiscard]] auto condition(const sourcemeta::jsontoolkit::JSON &schema,
+                               const std::string &dialect,
+                               const std::set<std::string> &vocabularies,
+                               const sourcemeta::jsontoolkit::Pointer &) const
+      -> bool override {
     return !is_encoding(schema) &&
            dialect == "https://json-schema.org/draft/2020-12/schema" &&
            vocabularies.contains(

diff --git a/src/compiler/mapper_rules/integer_upper_bound.h b/src/compiler/mapper_rules/integer_upper_bound.h
@@ -3,11 +3,11 @@ class IntegerUpperBound final : public sourcemeta::alterschema::Rule {
   IntegerUpperBound()
       : sourcemeta::alterschema::Rule("integer_upper_bound", "TODO") {};
 
-  [[nodiscard]] auto
-  condition(const sourcemeta::jsontoolkit::JSON &schema,
-            const std::string &dialect,
-            const std::set<std::string> &vocabularies,
-            const sourcemeta::jsontoolkit::Pointer &) const -> bool override {
+  [[nodiscard]] auto condition(const sourcemeta::jsontoolkit::JSON &schema,
+                               const std::string &dialect,
+                               const std::set<std::string> &vocabularies,
+                               const sourcemeta::jsontoolkit::Pointer &) const
+      -> bool override {
     return !is_encoding(schema) &&
            dialect == "https://json-schema.org/draft/2020-12/schema" &&
            vocabularies.contains(

diff --git a/src/compiler/mapper_rules/integer_upper_bound_multiplier.h b/src/compiler/mapper_rules/integer_upper_bound_multiplier.h
@@ -4,11 +4,11 @@ class IntegerUpperBoundMultiplier final : public sourcemeta::alterschema::Rule {
       : sourcemeta::alterschema::Rule("integer_upper_bound_multiplier",
                                       "TODO") {};
 
-  [[nodiscard]] auto
-  condition(const sourcemeta::jsontoolkit::JSON &schema,
-            const std::string &dialect,
-            const std::set<std::string> &vocabularies,
-            const sourcemeta::jsontoolkit::Pointer &) const -> bool override {
+  [[nodiscard]] auto condition(const sourcemeta::jsontoolkit::JSON &schema,
+                               const std::string &dialect,
+                               const std::set<std::string> &vocabularies,
+                               const sourcemeta::jsontoolkit::Pointer &) const
+      -> bool override {
     return !is_encoding(schema) &&
            dialect == "https://json-schema.org/draft/2020-12/schema" &&
            vocabularies.contains(

diff --git a/src/compiler/mapper_rules/number_arbitrary.h b/src/compiler/mapper_rules/number_arbitrary.h
@@ -3,11 +3,11 @@ class NumberArbitrary final : public sourcemeta::alterschema::Rule {
   NumberArbitrary()
       : sourcemeta::alterschema::Rule("number_arbitrary", "TODO") {};
 
-  [[nodiscard]] auto
-  condition(const sourcemeta::jsontoolkit::JSON &schema,
-            const std::string &dialect,
-            const std::set<std::string> &vocabularies,
-            const sourcemeta::jsontoolkit::Pointer &) const -> bool override {
+  [[nodiscard]] auto condition(const sourcemeta::jsontoolkit::JSON &schema,
+                               const std::string &dialect,
+                               const std::set<std::string> &vocabularies,
+                               const sourcemeta::jsontoolkit::Pointer &) const
+      -> bool override {
     return !is_encoding(schema) &&
            dialect == "https://json-schema.org/draft/2020-12/schema" &&
            vocabularies.contains(

diff --git a/src/runtime/include/sourcemeta/jsonbinpack/runtime_decoder_basic.h b/src/runtime/include/sourcemeta/jsonbinpack/runtime_decoder_basic.h
@@ -74,8 +74,8 @@ template <typename CharT, typename Traits> class BasicDecoder {
            this->stream.rdbuf()->sgetc() == '\0';
   }
 
-  inline auto
-  get_string_utf8(const std::uint64_t length) -> std::basic_string<CharT> {
+  inline auto get_string_utf8(const std::uint64_t length)
+      -> std::basic_string<CharT> {
     std::basic_string<CharT> result;
     result.reserve(length);
     std::uint64_t counter = 0;

diff --git a/src/runtime/include/sourcemeta/jsonbinpack/runtime_encoder.h b/src/runtime/include/sourcemeta/jsonbinpack/runtime_encoder.h
@@ -171,9 +171,10 @@ class Encoder : private BasicEncoder<CharT, Traits> {
     this->put_varint(static_cast<std::uint64_t>(cursor));
   }
 
-  auto TOP_LEVEL_BYTE_CHOICE_INDEX(
-      const sourcemeta::jsontoolkit::JSON &document,
-      const TOP_LEVEL_BYTE_CHOICE_INDEX &options) -> void {
+  auto
+  TOP_LEVEL_BYTE_CHOICE_INDEX(const sourcemeta::jsontoolkit::JSON &document,
+                              const TOP_LEVEL_BYTE_CHOICE_INDEX &options)
+      -> void {
     assert(options.choices.size() > 0);
     assert(is_byte(options.choices.size()));
     const auto iterator{std::find_if(
@@ -361,9 +362,9 @@ class Encoder : private BasicEncoder<CharT, Traits> {
     }
   }
 
-  auto
-  BOUNDED_8BITS_TYPED_ARRAY(const sourcemeta::jsontoolkit::JSON &document,
-                            const BOUNDED_8BITS_TYPED_ARRAY &options) -> void {
+  auto BOUNDED_8BITS_TYPED_ARRAY(const sourcemeta::jsontoolkit::JSON &document,
+                                 const BOUNDED_8BITS_TYPED_ARRAY &options)
+      -> void {
     assert(options.maximum >= options.minimum);
     const auto size{document.size()};
     assert(is_within(size, options.minimum, options.maximum));
@@ -391,9 +392,10 @@ class Encoder : private BasicEncoder<CharT, Traits> {
                                        std::move(options.prefix_encodings)});
   }
 
-  auto FIXED_TYPED_ARBITRARY_OBJECT(
-      const sourcemeta::jsontoolkit::JSON &document,
-      const FIXED_TYPED_ARBITRARY_OBJECT &options) -> void {
+  auto
+  FIXED_TYPED_ARBITRARY_OBJECT(const sourcemeta::jsontoolkit::JSON &document,
+                               const FIXED_TYPED_ARBITRARY_OBJECT &options)
+      -> void {
     assert(document.is_object());
     assert(document.size() == options.size);
 
@@ -404,9 +406,10 @@ class Encoder : private BasicEncoder<CharT, Traits> {
     }
   }
 
-  auto VARINT_TYPED_ARBITRARY_OBJECT(
-      const sourcemeta::jsontoolkit::JSON &document,
-      const VARINT_TYPED_ARBITRARY_OBJECT &options) -> void {
+  auto
+  VARINT_TYPED_ARBITRARY_OBJECT(const sourcemeta::jsontoolkit::JSON &document,
+                                const VARINT_TYPED_ARBITRARY_OBJECT &options)
+      -> void {
     assert(document.is_object());
     const auto size{document.size()};
     this->put_varint(size);
@@ -418,9 +421,10 @@ class Encoder : private BasicEncoder<CharT, Traits> {
     }
   }
 
-  auto ANY_PACKED_TYPE_TAG_BYTE_PREFIX(
-      const sourcemeta::jsontoolkit::JSON &document,
-      const ANY_PACKED_TYPE_TAG_BYTE_PREFIX &) -> void {
+  auto
+  ANY_PACKED_TYPE_TAG_BYTE_PREFIX(const sourcemeta::jsontoolkit::JSON &document,
+                                  const ANY_PACKED_TYPE_TAG_BYTE_PREFIX &)
+      -> void {
     using namespace internal::ANY_PACKED_TYPE_TAG_BYTE_PREFIX;
     if (document.is_null()) {
       this->put_byte(TYPE_OTHER | (SUBTYPE_NULL << type_size));

diff --git a/src/runtime/include/sourcemeta/jsonbinpack/runtime_encoder_context.h b/src/runtime/include/sourcemeta/jsonbinpack/runtime_encoder_context.h
@@ -76,13 +76,13 @@ template <typename CharT> class Context {
     this->offsets.erase(iterator);
   }
 
-  auto has(const std::basic_string<CharT> &value,
-           const Type type) const -> bool {
+  auto has(const std::basic_string<CharT> &value, const Type type) const
+      -> bool {
     return this->strings.contains(std::make_pair(value, type));
   }
 
-  auto offset(const std::basic_string<CharT> &value,
-              const Type type) const -> std::uint64_t {
+  auto offset(const std::basic_string<CharT> &value, const Type type) const
+      -> std::uint64_t {
     // This method assumes the value indeed exists for performance reasons
     assert(this->has(value, type));
     return this->strings.at(std::make_pair(value, type));

diff --git a/src/runtime/include/sourcemeta/jsonbinpack/runtime_encoder_real.h b/src/runtime/include/sourcemeta/jsonbinpack/runtime_encoder_real.h
@@ -28,8 +28,8 @@ constexpr auto correct_ieee764(const Real value) -> Real {
 }
 
 template <std::integral Integer, std::floating_point Real>
-constexpr auto real_digits(Real value,
-                           std::uint64_t *point_position) -> Integer {
+constexpr auto real_digits(Real value, std::uint64_t *point_position)
+    -> Integer {
   assert(std::isfinite(value));
   Real integral;
   std::uint64_t shifts{0};