update to clang-format-21

.github/workflows/lint_and_format_check.yml

@@ -29,7 +29,7 @@ jobs:
       - name: Run clang-format
         uses: jidicula/clang-format-action@6cd220de46c89139a0365edae93eee8eb30ca8fe # v4.16.0
         with:
-          clang-format-version: '17'
+          clang-format-version: '21'
           fallback-style: 'Google'
 
       - uses: chartboost/ruff-action@e18ae971ccee1b2d7bbef113930f00c670b78da4 # v1.0.0
@@ -39,7 +39,7 @@ jobs:
 
       - name: Run clang-tidy
         run: >
-          cmake -B build -DADA_TESTING=ON -DCMAKE_CXX_CLANG_TIDY=clang-tidy-17 &&
+          cmake -B build -DADA_TESTING=ON -DCMAKE_CXX_CLANG_TIDY=clang-tidy-21 &&
           cmake --build build -j=4
         env:
-          CXX: clang++-17
+          CXX: clang++-21

benchmarks/competitors/servo-url/servo_url.h

@@ -16,13 +16,13 @@ struct Url;
 
 extern "C" {
 
-Url *parse_url(const char *raw_input, size_t raw_input_length);
+Url* parse_url(const char* raw_input, size_t raw_input_length);
 
-void free_url(Url *raw);
+void free_url(Url* raw);
 
-const char *parse_url_to_href(const char *raw_input, size_t raw_input_length);
+const char* parse_url_to_href(const char* raw_input, size_t raw_input_length);
 
-void free_string(const char *);
+void free_string(const char*);
 }  // extern "C"
 
 }  // namespace servo_url

benchmarks/model_bench.cpp

@@ -9,7 +9,7 @@
 #include "performancecounters/event_counter.h"
 event_collector collector;
 
-bool file_exists(const char *filename) {
+bool file_exists(const char* filename) {
   namespace fs = std::filesystem;
   std::filesystem::path f{filename};
   if (std::filesystem::exists(filename)) {
@@ -33,7 +33,7 @@ std::string read_file(std::string filename) {
   return out;
 }
 
-std::vector<std::string> split_string(const std::string &str) {
+std::vector<std::string> split_string(const std::string& str) {
   auto result = std::vector<std::string>{};
   std::stringstream ss{str};
   for (std::string line; std::getline(ss, line, '\n');) {
@@ -65,7 +65,7 @@ struct stat_numbers {
   bool has_search = false;
 };
 
-size_t count_ascii_bytes(const std::string &s) {
+size_t count_ascii_bytes(const std::string& s) {
   size_t counter = 0;
   for (uint8_t c : s) {
     if (c < 128) {
@@ -77,7 +77,7 @@ size_t count_ascii_bytes(const std::string &s) {
 
 template <class result_type = ada::url_aggregator>
 std::vector<stat_numbers> collect_values(
-    const std::vector<std::string> &url_examples, size_t trials) {
+    const std::vector<std::string>& url_examples, size_t trials) {
   std::vector<stat_numbers> numbers(url_examples.size());
   for (size_t i = 0; i < url_examples.size(); i++) {
     numbers[i].url_string = url_examples[i];
@@ -96,7 +96,7 @@ std::vector<stat_numbers> collect_values(
   }
   volatile size_t href_size = 0;
   for (size_t i = 0; i < trials; i++) {
-    for (stat_numbers &n : numbers) {
+    for (stat_numbers& n : numbers) {
       std::atomic_thread_fence(std::memory_order_acquire);
       collector.start();
       ada::result<result_type> url = ada::parse<result_type>(n.url_string);
@@ -112,12 +112,12 @@ std::vector<stat_numbers> collect_values(
 }
 
 #ifdef ADA_URL_FILE
-const char *default_file = ADA_URL_FILE;
+const char* default_file = ADA_URL_FILE;
 #else
-const char *default_file = nullptr;
+const char* default_file = nullptr;
 #endif
 
-std::vector<std::string> init_data(const char *input = default_file) {
+std::vector<std::string> init_data(const char* input = default_file) {
   std::vector<std::string> input_urls;
   if (input == nullptr) {
     return input_urls;
@@ -133,7 +133,7 @@ std::vector<std::string> init_data(const char *input = default_file) {
   return input_urls;
 }
 
-void print(const stat_numbers &n) {
+void print(const stat_numbers& n) {
   std::cout << std::setw(15) << n.url_string.size() << ",";
   std::cout << std::setw(15) << n.counters.best.cycles() << "," << std::setw(15)
             << size_t(n.counters.cycles()) << ",";
@@ -238,13 +238,13 @@ void print(const std::vector<stat_numbers> numbers) {
 
   std::cout << std::endl;
 
-  for (const stat_numbers &n : numbers) {
+  for (const stat_numbers& n : numbers) {
     print(n);
     std::cout << std::endl;
   }
 }
 
-int main(int argc, char **argv) {
+int main(int argc, char** argv) {
   std::vector<std::string> input_urls;
   if (argc == 1) {
     input_urls = init_data();

benchmarks/performancecounters/linux-perf-events.h

@@ -76,7 +76,7 @@ class LinuxEvents {
     }
   }
 
-  inline void end(std::vector<unsigned long long> &results) {
+  inline void end(std::vector<unsigned long long>& results) {
     if (fd != -1) {
       if (ioctl(fd, PERF_EVENT_IOC_DISABLE, PERF_IOC_FLAG_GROUP) == -1) {
         report_error("ioctl(PERF_EVENT_IOC_DISABLE)");
@@ -100,6 +100,6 @@ class LinuxEvents {
   bool is_working() { return working; }
 
  private:
-  void report_error(const std::string &) { working = false; }
+  void report_error(const std::string&) { working = false; }
 };
 #endif

benchmarks/wpt_bench.cpp

@@ -11,7 +11,7 @@ enum {
   ALL_URLS = -1,
 };
 
-size_t init_data(const char *source, int which_url) {
+size_t init_data(const char* source, int which_url) {
   ondemand::parser parser;
   std::vector<std::pair<std::string, std::string>> answer;
 
@@ -66,15 +66,15 @@ size_t init_data(const char *source, int which_url) {
 }
 
 template <class result>
-static void BasicBench_AdaURL(benchmark::State &state) {
+static void BasicBench_AdaURL(benchmark::State& state) {
   // volatile to prevent optimizations.
   volatile size_t href_size = 0;
 
   for (auto _ : state) {
-    for (const std::pair<std::string, std::string> &url_strings :
+    for (const std::pair<std::string, std::string>& url_strings :
          url_examples) {
       ada::result<result> base;
-      result *base_ptr = nullptr;
+      result* base_ptr = nullptr;
       if (!url_strings.second.empty()) {
         base = ada::parse<result>(url_strings.second);
         if (base) {
@@ -94,10 +94,10 @@ static void BasicBench_AdaURL(benchmark::State &state) {
     for (size_t i = 0; i < N; i++) {
       std::atomic_thread_fence(std::memory_order_acquire);
       collector.start();
-      for (const std::pair<std::string, std::string> &url_strings :
+      for (const std::pair<std::string, std::string>& url_strings :
            url_examples) {
         ada::result<result> base;
-        result *base_ptr = nullptr;
+        result* base_ptr = nullptr;
         if (!url_strings.second.empty()) {
           base = ada::parse<result>(url_strings.second);
           if (base) {
@@ -153,13 +153,13 @@ BENCHMARK(BasicBench_AdaURL_url_aggregator);
 
 #include <upa/url.h>
 
-static void BasicBench_whatwg(benchmark::State &state) {
+static void BasicBench_whatwg(benchmark::State& state) {
   volatile size_t success{};
   for (auto _ : state) {
-    for (const std::pair<std::string, std::string> &url_strings :
+    for (const std::pair<std::string, std::string>& url_strings :
          url_examples) {
       upa::url base;
-      upa::url *base_ptr = nullptr;
+      upa::url* base_ptr = nullptr;
       if (!url_strings.second.empty()) {
         if (upa::success(base.parse(url_strings.second, nullptr))) {
           base_ptr = &base;
@@ -176,10 +176,10 @@ static void BasicBench_whatwg(benchmark::State &state) {
     for (size_t i = 0; i < N; i++) {
       std::atomic_thread_fence(std::memory_order_acquire);
       collector.start();
-      for (const std::pair<std::string, std::string> &url_strings :
+      for (const std::pair<std::string, std::string>& url_strings :
            url_examples) {
         upa::url base;
-        upa::url *base_ptr = nullptr;
+        upa::url* base_ptr = nullptr;
         if (!url_strings.second.empty()) {
           if (upa::success(base.parse(url_strings.second, nullptr))) {
             base_ptr = &base;
@@ -227,7 +227,7 @@ static void BasicBench_whatwg(benchmark::State &state) {
 BENCHMARK(BasicBench_whatwg);
 #endif  // ADA_url_whatwg_ENABLED
 
-int main(int argc, char **argv) {
+int main(int argc, char** argv) {
   int which_url = ALL_URLS;
   if (argc > 3 && std::string_view(argv[2]) == "--select") {
     which_url = std::atoi(argv[3]);

fuzz/can_parse.cc

@@ -6,7 +6,7 @@
 #include "ada.cpp"
 #include "ada.h"
 
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
   FuzzedDataProvider fdp(data, size);
   std::string source = fdp.ConsumeRandomLengthString(256);
   std::string base_source = fdp.ConsumeRandomLengthString(256);

fuzz/idna.cc

@@ -6,7 +6,7 @@
 #include "ada.cpp"
 #include "ada.h"
 
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
   FuzzedDataProvider fdp(data, size);
   std::string source = fdp.ConsumeRandomLengthString(256);
 

fuzz/parse.cc

@@ -7,8 +7,8 @@
 #include "ada.cpp"
 #include "ada.h"
 
-bool is_valid_utf8_string(const char *buf, size_t len) {
-  const uint8_t *data = reinterpret_cast<const uint8_t *>(buf);
+bool is_valid_utf8_string(const char* buf, size_t len) {
+  const uint8_t* data = reinterpret_cast<const uint8_t*>(buf);
   uint64_t pos = 0;
   uint32_t code_point = 0;
   while (pos < len) {
@@ -91,7 +91,7 @@ bool is_valid_utf8_string(const char *buf, size_t len) {
   return true;
 }
 
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
   FuzzedDataProvider fdp(data, size);
   std::string source = fdp.ConsumeRandomLengthString(256);
 

fuzz/url_search_params.cc

@@ -6,7 +6,7 @@
 #include "ada.cpp"
 #include "ada.h"
 
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
   FuzzedDataProvider fdp(data, size);
   std::string source = fdp.ConsumeRandomLengthString(256);
   std::string base_source = fdp.ConsumeRandomLengthString(256);

include/ada/common_defs.h

@@ -40,10 +40,10 @@
 #endif
 
 // Align to N-byte boundary
-#define ADA_ROUNDUP_N(a, n) (((a) + ((n)-1)) & ~((n)-1))
-#define ADA_ROUNDDOWN_N(a, n) ((a) & ~((n)-1))
+#define ADA_ROUNDUP_N(a, n) (((a) + ((n) - 1)) & ~((n) - 1))
+#define ADA_ROUNDDOWN_N(a, n) ((a) & ~((n) - 1))
 
-#define ADA_ISALIGNED_N(ptr, n) (((uintptr_t)(ptr) & ((n)-1)) == 0)
+#define ADA_ISALIGNED_N(ptr, n) (((uintptr_t)(ptr) & ((n) - 1)) == 0)
 
 #if defined(ADA_REGULAR_VISUAL_STUDIO)