refactor: Better IWYU correctness

Author: nickelpro

CMakeLists.txt

@@ -7,11 +7,18 @@ project(velocem LANGUAGES C CXX VERSION 0.0.13)
 option(VELOCEM_USE_IO_URING "Use io_uring on Linux" ON)
 option(VELOCEM_USE_IPO "Use interprocedural optimization if supported" ON)
 option(VELOCEM_STRIP "Run system strip on compiled module" ON)
+option(VELOCEM_GEN_IWYU_MAPPINGS "Generate Python mappings for IWYU" OFF)
 set(VELOCEM_WIN_SDK_VER 0x0A00 CACHE STRING "Windows SDK macro version")
 
 find_package(asio CONFIG REQUIRED)
 find_package(llhttp CONFIG REQUIRED)
-find_package(Python3 3.12 REQUIRED COMPONENTS Development.Module)
+
+if(VELOCEM_GEN_IWYU_MAPPINGS)
+  find_package(Python3 3.13 REQUIRED COMPONENTS Interpreter Development.Module)
+  include(iwyu/GetIWYUMapGen.cmake)
+else()
+  find_package(Python3 3.13 REQUIRED COMPONENTS Development.Module)
+endif()
 
 Python3_add_library(velocem MODULE)
 target_link_libraries(velocem PRIVATE

iwyu/GetIWYUMapGen.cmake

@@ -0,0 +1,17 @@
+include(FetchContent)
+
+FetchContent_Declare(
+  pythonMapGen
+  URL https://raw.githubusercontent.com/include-what-you-use/include-what-you-use/e4dd555000b824f11783d99b93d4a713fe34dd1d/mapgen/iwyu-mapgen-cpython.py
+  URL_HASH SHA512=ef1e39cd9c735ca218d45e1f643cf06f73327446cc1d8ec8ced86503a0db727ae6b53ee879a979b214d9a5fa6a333daf5a6bf4ef821fd4a43ad44b34df3448bc
+  DOWNLOAD_NO_EXTRACT TRUE
+)
+FetchContent_MakeAvailable(pythonMapGen)
+
+execute_process(
+  COMMAND ${Python3_EXECUTABLE} ${pythonmapgen_SOURCE_DIR}/iwyu-mapgen-cpython.py ${Python3_INCLUDE_DIRS}
+  OUTPUT_FILE ${CMAKE_BINARY_DIR}/python_mappings.imp
+  COMMAND_ECHO STDOUT
+)
+
+list(APPEND CMAKE_CXX_INCLUDE_WHAT_YOU_USE -Xiwyu --mapping_file=${CMAKE_BINARY_DIR}/python_mappings.imp)

src/HTTPParser.cpp

@@ -4,12 +4,13 @@
 #include <cstring>
 #include <span>
 #include <stdexcept>
-#include <string_view>
-#include <utility>
+#include <vector>
 
-#include <asio.hpp>
+#include <asio/buffer.hpp>
 #include <llhttp.h>
 
+#include "util/BalmStringView.hpp"
+#include "wsgi/Input.hpp"
 #include "wsgi/Request.hpp"
 
 namespace velocem {

src/HTTPParser.hpp

@@ -2,16 +2,16 @@
 #define VELOCEM_HTTP_PARSER_HPP
 
 #include <cstddef>
-#include <cstring>
 #include <span>
-#include <stdexcept>
-#include <string_view>
-#include <utility>
 
-#include <asio.hpp>
 #include <llhttp.h>
 
-#include "wsgi/Request.hpp"
+namespace asio {
+class mutable_buffer;
+}
+namespace velocem {
+struct WSGIRequest;
+}
 
 namespace velocem {
 

src/plat/linux.cpp

@@ -1,6 +1,4 @@
-
-#include <asio.hpp>
-
+#include <asio/ip/tcp.hpp>
 #include <sys/socket.h>
 
 int set_reuse_port(asio::ip::tcp::acceptor& sock) {

src/util/Constants.hpp

@@ -2,8 +2,6 @@
 #define VELOCEM_CONSTANTS_HPP
 
 #include <array>
-#include <chrono>
-#include <format>
 #include <string>
 #include <string_view>
 

src/util/Util.cpp

@@ -1,6 +1,6 @@
 #include "Util.hpp"
 
-#include <cstdlib>
+#include <cstddef>
 #include <stdexcept>
 #include <string>
 #include <vector>

src/util/Util.hpp

@@ -1,10 +1,11 @@
 #ifndef VELOCEM_UTIL_HPP
 #define VELOCEM_UTIL_HPP
 
+#include <cstddef>
 #include <string>
 #include <vector>
 
-#include <asio.hpp>
+#include <asio/buffer.hpp>
 
 #include <Python.h>
 

src/wsgi/App.cpp

@@ -1,12 +1,15 @@
 #include "App.hpp"
 
+#include <array>
 #include <charconv>
-#include <chrono>
 #include <cstdlib>
+#include <format>
 #include <optional>
 #include <queue>
 #include <ranges>
 #include <stdexcept>
+#include <system_error>
+#include <tuple>
 #include <vector>
 
 #include <Python.h>

src/wsgi/App.hpp

@@ -6,7 +6,9 @@
 
 #include <Python.h>
 
-#include "Request.hpp"
+namespace velocem {
+struct WSGIRequest;
+}
 
 namespace velocem {