include-what-you-use 0.25 fixes

art.hpp

@@ -3,14 +3,12 @@
 #define UNODB_DETAIL_ART_HPP
 
 // Should be the first include
-#include "global.hpp"  // IWYU pragma: keep
+#include "global.hpp"
 
-// IWYU pragma: no_include <__ostream/basic_ostream.h>
 
 #include <cstddef>
 #include <cstdint>
 #include <iostream>
-#include <limits>
 #include <optional>
 #include <stack>
 #include <type_traits>
@@ -27,7 +25,7 @@ namespace unodb {
 namespace detail {
 
 template <typename Key, typename Value>
-class inode;  // IWYU pragma: keep
+class inode;
 
 template <typename Key, typename Value>
 class inode_4;

art_common.hpp

@@ -3,18 +3,13 @@
 #define UNODB_DETAIL_ART_COMMON_HPP
 
 // Should be the first include
-#include "global.hpp"  // IWYU pragma: keep
+#include "global.hpp"
 
-// IWYU pragma: no_include <__fwd/ostream.h>
-// IWYU pragma: no_include <ostream>
-// IWYU pragma: no_include <ostream.h>
-
-#include <cmath>
 #include <cstddef>
 #include <cstdint>
 #include <cstring>
 #include <iomanip>
-#include <iosfwd>  // IWYU pragma: keep
+#include <iosfwd>
 #include <iostream>
 #include <span>
 #include <string_view>

art_internal.cpp

@@ -1,10 +1,9 @@
 // Copyright 2021-2025 UnoDB contributors
 
 // Should be the first include
-#include "global.hpp"  // IWYU pragma: keep
+#include "global.hpp"
 
 // IWYU pragma: no_include <__ostream/basic_ostream.h>
-// IWYU pragma: no_include <span>
 
 #include "art_internal.hpp"  // IWYU pragma: keep
 

art_internal.hpp

@@ -3,8 +3,9 @@
 #define UNODB_DETAIL_ART_INTERNAL_HPP
 
 // Should be the first include
-#include "global.hpp"  // IWYU pragma: keep
+#include "global.hpp"
 
+// IWYU pragma: no_include <__cstddef/byte.h>
 // IWYU pragma: no_include <_string.h>
 
 #include <algorithm>

art_internal_impl.hpp

@@ -3,7 +3,7 @@
 #define UNODB_DETAIL_ART_INTERNAL_IMPL_HPP
 
 // Should be the first include
-#include "global.hpp"  // IWYU pragma: keep
+#include "global.hpp"
 
 #include <algorithm>
 #include <array>

benchmark/micro_benchmark.cpp

@@ -3,15 +3,13 @@
 // Should be the first include
 #include "global.hpp"  // IWYU pragma: keep
 
+// IWYU pragma: no_include <__vector/vector.h>
+// IWYU pragma: no_include <array>
 // IWYU pragma: no_include <string>
-// IWYU pragma: no_include <tuple>
-// IWYU pragma: no_include <vector>
-// IWYU pragma: no_forward_declare unodb::visitor
 
-#include <array>
 #include <cstddef>
 #include <cstdint>
-#include <utility>  // IWYU pragma: keep
+#include <tuple>
 
 #include <benchmark/benchmark.h>
 

benchmark/micro_benchmark_concurrency.hpp

@@ -3,11 +3,7 @@
 #define UNODB_DETAIL_MICRO_BENCHMARK_CONCURRENCY_HPP
 
 // Should be the first include
-#include "global.hpp"  // IWYU pragma: keep
-
-#include <memory>
-#include <thread>
-#include <vector>
+#include "global.hpp"
 
 #include <benchmark/benchmark.h>
 

benchmark/micro_benchmark_key_prefix.cpp

@@ -3,11 +3,11 @@
 // Should be the first include
 #include "global.hpp"  // IWYU pragma: keep
 
-// IWYU pragma: no_include <string>
+// IWYU pragma: no_include <__vector/vector.h>
 
 #include <algorithm>
 #include <cstdint>
-#include <vector>
+#include <vector>  // IWYU pragma: keep
 
 #include <benchmark/benchmark.h>
 

benchmark/micro_benchmark_mutex.cpp

@@ -3,8 +3,6 @@
 // Should be the first include
 #include "global.hpp"  // IWYU pragma: keep
 
-// IWYU pragma: no_include <string>
-
 #include <thread>
 
 #include <benchmark/benchmark.h>

benchmark/micro_benchmark_n16.cpp

@@ -3,8 +3,6 @@
 // Should be the first include
 #include "global.hpp"  // IWYU pragma: keep
 
-// IWYU pragma: no_include <string>
-
 #include <benchmark/benchmark.h>
 
 #include "micro_benchmark_node_utils.hpp"

benchmark/micro_benchmark_n256.cpp

@@ -3,8 +3,6 @@
 // Should be the first include
 #include "global.hpp"  // IWYU pragma: keep
 
-// IWYU pragma: no_include <string>
-
 #include <benchmark/benchmark.h>
 
 #include "micro_benchmark_node_utils.hpp"

benchmark/micro_benchmark_n4.cpp

@@ -4,11 +4,12 @@
 #include "global.hpp"  // IWYU pragma: keep
 
 // IWYU pragma: no_include <string>
+// IWYU pragma: no_include <__vector/vector.h>
 
 #include <algorithm>
 #include <cstddef>
 #include <cstdint>
-#include <vector>
+#include <vector>  // IWYU pragma: keep
 
 #include <benchmark/benchmark.h>
 

benchmark/micro_benchmark_n48.cpp

@@ -3,8 +3,6 @@
 // Should be the first include
 #include "global.hpp"  // IWYU pragma: keep
 
-// IWYU pragma: no_include <string>
-
 #include <benchmark/benchmark.h>
 
 #include "micro_benchmark_node_utils.hpp"

benchmark/micro_benchmark_node_utils.hpp

@@ -3,21 +3,22 @@
 #define UNODB_DETAIL_MICRO_BENCHMARK_NODE_UTILS_HPP
 
 // Should be the first include
-#include "global.hpp"  // IWYU pragma: keep
+#include "global.hpp"
 
 #include <algorithm>
 #include <array>
 #include <cstddef>
 #include <cstdint>
-#ifndef NDEBUG
-#include <iostream>
-#endif
 #include <limits>
 #include <random>
 #include <string>
 #include <tuple>
 #include <vector>
 
+#ifndef NDEBUG
+#include <iostream>
+#endif
+
 #include <benchmark/benchmark.h>
 
 #include "art_common.hpp"

benchmark/micro_benchmark_utils.cpp

@@ -3,11 +3,11 @@
 // Should be the first include
 #include "global.hpp"  // IWYU pragma: keep
 
-#include "micro_benchmark_utils.hpp"
+#include "micro_benchmark_utils.hpp"  // IWYU pragma: keep
 
 #include <benchmark/benchmark.h>
 
-#include "art.hpp"        // IWYU pragma: keep
+#include "art.hpp"  // IWYU pragma: keep
 #include "mutex_art.hpp"  // IWYU pragma: keep
 #include "olc_art.hpp"    // IWYU pragma: keep
 

benchmark/micro_benchmark_utils.hpp

@@ -3,12 +3,13 @@
 #define UNODB_DETAIL_MICRO_BENCHMARK_UTILS_HPP
 
 // Should be the first include
-#include "global.hpp"  // IWYU pragma: keep
+#include "global.hpp"
 
 // IWYU pragma: no_include <__ostream/basic_ostream.h>
+// IWYU pragma: no_include <__cstddef/byte.h>
 
 #include <array>
-#include <cstddef>
+#include <cstddef>  // IWYU pragma: keep
 #include <cstdint>
 #ifndef NDEBUG
 #include <iostream>

examples/example_art.cpp

@@ -4,10 +4,7 @@
 // self-containedness does not concern with exception handling and refactoring
 // the duplicated code with other examples.
 
-// IWYU pragma: no_include <__ostream/basic_ostream.h>
-// IWYU pragma: no_include <span>
-
-#include "global.hpp"  // IWYU pragma: keep
+#include "global.hpp"
 
 #include <cstddef>
 #include <iostream>

examples/example_art_stats.cpp

@@ -4,9 +4,7 @@
 // self-containedness does not concern with exception handling and refactoring
 // the duplicated code with other examples.
 
-// IWYU pragma: no_include <__ostream/basic_ostream.h>
-
-#include "global.hpp"  // IWYU pragma: keep
+#include "global.hpp"
 
 #include <cstddef>
 #include <iostream>

examples/example_olc_art.cpp

@@ -4,11 +4,7 @@
 // self-containedness does not concern with exception handling and refactoring
 // the duplicated code with other examples.
 
-// IWYU pragma: no_include <__ostream/basic_ostream.h>
-// IWYU pragma: no_include <allocator>
-// IWYU pragma: no_include <memory>
-
-#include "global.hpp"  // IWYU pragma: keep
+#include "global.hpp"
 
 // std::cerr should be safe to access from different threads if it is
 // synchronized with the C streams, yet TSan under XCode gives diagnostics.

fuzz_deepstate/test_art_fuzz_deepstate.cpp

@@ -18,8 +18,8 @@
 #include <deepstate/DeepState.h>
 #include <deepstate/DeepState.hpp>
 
-#include "art.hpp"
-#include "art_common.hpp"
+#include "art.hpp"         // IWYU pragma: keep
+#include "art_common.hpp"  // IWYU pragma: keep
 #include "deepstate_utils.hpp"
 #include "node_type.hpp"
 #include "test_heap.hpp"

heap.hpp

@@ -6,7 +6,7 @@
 /// Aligned heap memory allocation.
 
 // Should be the first include
-#include "global.hpp"  // IWYU pragma: keep
+#include "global.hpp"
 
 #include <algorithm>
 #ifndef NDEBUG

in_fake_critical_section.hpp

@@ -17,7 +17,7 @@
 /// and concurrent use cases.
 
 // Should be the first include
-#include "global.hpp"  // IWYU pragma: keep
+#include "global.hpp"
 
 #include <cstddef>
 

mutex_art.hpp

@@ -3,16 +3,14 @@
 #define UNODB_DETAIL_MUTEX_ART_HPP
 
 // Should be the first include
-#include "global.hpp"  // IWYU pragma: keep
+#include "global.hpp"
 
 #include <cassert>
 #include <mutex>
 #include <type_traits>
 #include <utility>
 
 #include "art.hpp"
-#include "assert.hpp"
-#include "node_type.hpp"
 
 namespace unodb {
 

olc_art.hpp

@@ -6,9 +6,7 @@
 /// Concurrent Adaptive Radix Tree based on Optimistic Lock Coupling
 
 // Should be the first include
-#include "global.hpp"  // IWYU pragma: keep
-
-// IWYU pragma: no_include <__ostream/basic_ostream.h>
+#include "global.hpp"
 
 #include <array>
 #include <atomic>

optimistic_lock.hpp

@@ -211,15 +211,13 @@
 /// \}
 
 // Should be the first include
-#include "global.hpp"  // IWYU pragma: keep
+#include "global.hpp"
 
 #include <atomic>
 #include <cstddef>
 #include <cstdint>
 #include <iomanip>
 #include <iostream>
-#include <iterator>
-#include <optional>
 #include <thread>
 #include <tuple>
 #include <type_traits>

portability_builtins.hpp

@@ -8,7 +8,7 @@
 /// \ingroup internal
 
 // Should be the first include
-#include "global.hpp"  // IWYU pragma: keep
+#include "global.hpp"
 
 #include <cstdint>
 #include <cstring>
@@ -61,35 +61,35 @@
     T x) noexcept {
   static_assert(std::is_same_v<unsigned, T> ||
                 // NOLINTNEXTLINE(google-runtime-int)
                 std::is_same_v<unsigned long, T> ||  // NOLINT(runtime/int)
                 // NOLINTNEXTLINE(google-runtime-int)
                 std::is_same_v<unsigned long long, T>);  // NOLINT(runtime/int)
 
   if constexpr (std::is_same_v<unsigned, T>) {
 #ifndef UNODB_DETAIL_MSVC
     return static_cast<std::uint8_t>(__builtin_ctz(x));
 #else
     unsigned long result;  // NOLINT(runtime/int)
     _BitScanForward(&result, x);
     return static_cast<std::uint8_t>(result);
 #endif
   }
   // NOLINTNEXTLINE(google-runtime-int)
   if constexpr (std::is_same_v<unsigned long, T>) {  // NOLINT(runtime/int)
 #ifndef UNODB_DETAIL_MSVC
     return static_cast<std::uint8_t>(__builtin_ctzl(x));
 #else
     unsigned long result;  // NOLINT(runtime/int)
     _BitScanForward(&result, x);
     return static_cast<std::uint8_t>(result);
 #endif
   }
   // NOLINTNEXTLINE(google-runtime-int)
   if constexpr (std::is_same_v<unsigned long long, T>) {  // NOLINT(runtime/int)
 #ifndef UNODB_DETAIL_MSVC
     return static_cast<std::uint8_t>(__builtin_ctzll(x));
 #else
     unsigned long result;  // NOLINT(runtime/int)
     _BitScanForward64(&result, x);
     return static_cast<std::uint8_t>(result);
 #endif

qsbr.cpp

@@ -9,8 +9,9 @@
 /// registration and orphaned deallocation request list management helpers.
 
 // Should be the first include
-#include "global.hpp"  // IWYU pragma: keep
+#include "global.hpp"
 
+// IWYU pragma: no_include <__new/exceptions.h>
 // IWYU pragma: no_include <__hash_table>
 
 #include "qsbr.hpp"
@@ -20,7 +21,7 @@
 #include <exception>
 #include <iostream>
 #include <memory>
-#include <new>
+#include <new>  // IWYU pragma: keep
 #include <utility>
 
 #ifdef UNODB_DETAIL_WITH_STATS

qsbr.hpp

@@ -22,10 +22,10 @@
 /// https://preshing.com/20160726/using-quiescent-states-to-reclaim-memory/
 
 // Should be the first include
-#include "global.hpp"  // IWYU pragma: keep
+#include "global.hpp"
 
-// IWYU pragma: no_include <__fwd/ostream.h>
 // IWYU pragma: no_include <__ostream/basic_ostream.h>
+// IWYU pragma: no_include <__vector/vector.h>
 // IWYU pragma: no_include <boost/fusion/algorithm/iteration/for_each.hpp>
 // IWYU pragma: no_include <boost/fusion/algorithm/query/find_if.hpp>
 // IWYU pragma: no_include <boost/fusion/iterator/next.hpp>
@@ -43,7 +43,7 @@
 #include <thread>
 #include <type_traits>
 #include <utility>
-#include <vector>
+#include <vector>  // IWYU pragma: keep
 
 #ifndef NDEBUG
 #include <functional>