Add modules unit test

mikomikotaishi · mikomikotaishi · commit ddb270e62818 · 2026-01-14T20:09:11.000-05:00
diff --git a/.github/workflows/test-docs-examples.yml b/.github/workflows/test-docs-examples.yml
@@ -18,7 +18,7 @@ permissions:
 jobs:
   test_docs_examples:
     name: Test build examples
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     concurrency:
       group: ${{ github.workflow }}-${{ github.ref }}
       cancel-in-progress: true
@@ -35,17 +35,19 @@ jobs:
           submodules: recursive
   
       - name: Install apt packages
-        run: sudo sed -i 's/azure\.//' /etc/apt/sources.list && sudo apt-get update && sudo apt-get install -y g++-12 libopus-dev zlib1g-dev libmpg123-dev liboggz-dev cmake libfmt-dev libopusfile-dev
+        run: sudo sed -i 's/azure\.//' /etc/apt/sources.list && sudo apt-get update && sudo apt-get install -y clang-20 libopus-dev ninja-build zlib1g-dev libmpg123-dev liboggz-dev cmake libfmt-dev libopusfile-dev
   
       - name: Generate CMake
-        run: mkdir build && cd build && cmake -DDPP_NO_VCPKG=ON -DAVX_TYPE=T_fallback -DDPP_CORO=ON -DCMAKE_BUILD_TYPE=Debug ..
+        run: mkdir build && cd build && cmake -G Ninja -DDPP_NO_VCPKG=ON -DDPP_MODULES=ON -DAVX_TYPE=T_fallback -DDPP_CORO=ON -DCMAKE_BUILD_TYPE=Debug ..
         env:
-          CXX: g++-12
+          CXX: clang++-20
   
       - name: Build Project
-        run: cd build && make -j2 && sudo make install
+        run: cd build && cmake --build . -j2 && sudo ninja install
+        env:
+          CXX: clang++-20
   
       - name: Test compile examples
-        run: cd docpages/example_code && mkdir build && cd build && cmake .. && make -j2
+        run: cd docpages/example_code && mkdir build && cd build && cmake -G Ninja .. && cmake --build . -j2
         env:
-          CXX: g++-12
+          CXX: clang++-20
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -33,7 +33,7 @@ option(DPP_USE_EXTERNAL_JSON "Use an external installation of nlohmann::json" OF
 option(DPP_USE_PCH "Use precompiled headers to speed up compilation" OFF)
 option(AVX_TYPE "Force AVX type for speeding up audio mixing" OFF)
 option(DPP_TEST_VCPKG "Force VCPKG build without VCPKG installed (for development use only!)" OFF)
-option(DPP_MODULES "Support for C++20 modules" OFF)
+option(DPP_MODULES "Support for C++20 modules (experimental)" OFF)
 
 include(CheckCXXSymbolExists)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
@@ -161,38 +161,3 @@ if (NOT WIN32)
 	target_link_libraries(dpp PRIVATE std::filesystem)
 endif()
 
-if (DPP_MODULES)
-	message("-- C++20 Modules support: ${Green}ENABLED${ColourReset}")
-	add_library(dpp_module)
-
-	target_sources(dpp_module
-		PUBLIC
-			FILE_SET CXX_MODULES
-			FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/dpp/dpp.cppm"
-	)
-
-	target_compile_features(dpp_module PUBLIC cxx_std_20)
-
-	target_include_directories(dpp_module PUBLIC
-		$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
-		$<INSTALL_INTERFACE:include>
-	)
-
-	target_link_libraries(dpp_module PUBLIC dpp)
-
-	add_library(dpp::module ALIAS dpp_module)
-
-	# Installation
-	install(TARGETS dpp_module
-		EXPORT ${PROJECT_NAME}Targets
-		LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-		ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-		RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-		FILE_SET CXX_MODULES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dpp/include
-	)
-
-	target_compile_definitions(dpp PUBLIC DPP_MODULES)
-else()
-	message("-- C++20 Modules support: ${Red}DISABLED${ColourReset} (enable with -DDPP_MODULES=ON)")
-endif()
-
diff --git a/docpages/example_code/CMakeLists.txt b/docpages/example_code/CMakeLists.txt
@@ -33,7 +33,7 @@ project(documentation_tests)
 
 string(ASCII 27 Esc)
 
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDPP_CORO -DPP_MODULES -std=c++20 -pthread -O0 -fPIC -rdynamic -DFMT_HEADER_ONLY -Wall -Wextra -Wpedantic -Werror -Wno-unused-parameter -Wno-deprecated-declarations")
+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDPP_CORO -DPP_MODULES -std=c++20 -pthread -O0 -fPIC -DFMT_HEADER_ONLY -Wall -Wextra -Wpedantic -Werror -Wno-unused-parameter -Wno-deprecated-declarations")
 set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0")
 
 file(GLOB example_list ./*.cpp)
diff --git a/docpages/example_code/attachments1.cpp b/docpages/example_code/attachments1.cpp
@@ -6,7 +6,7 @@ int main() {
 	bot.on_log(dpp::utility::cout_logger());
 
 	/* The event is fired when someone issues your commands */
-	bot.on_slashcommand([&bot](const dpp::slashcommand_t& event) {
+	bot.on_slashcommand([](const dpp::slashcommand_t& event) {
 		/* Check which command they ran */
 		if (event.command.get_command_name() == "file") {
 			dpp::message msg(event.command.channel_id, "Hey there, I've got a new file!");
diff --git a/docpages/example_code/autocomplete.cpp b/docpages/example_code/autocomplete.cpp
@@ -23,7 +23,7 @@ int main()
 	});
 
 	/* The interaction create event is fired when someone issues your commands */
-	bot.on_slashcommand([&bot](const dpp::slashcommand_t & event) {
+	bot.on_slashcommand([](const dpp::slashcommand_t & event) {
 		
 		/* Check which command they ran */
 		if (event.command.get_command_name() == "blep") {
diff --git a/docpages/example_code/cache_messages.cpp b/docpages/example_code/cache_messages.cpp
@@ -23,7 +23,7 @@ int main() {
 	});
 
 	/* The event is fired when someone issues your commands */
-	bot.on_slashcommand([&bot, &message_cache](const dpp::slashcommand_t& event) {
+	bot.on_slashcommand([&message_cache](const dpp::slashcommand_t& event) {
 		/* Check which command they ran */
 		if (event.command.get_command_name() == "get") {
 
diff --git a/docpages/example_code/components.cpp b/docpages/example_code/components.cpp
@@ -7,7 +7,7 @@ int main() {
 	bot.on_log(dpp::utility::cout_logger());
 
 	/* The event is fired when someone issues your commands */
-	bot.on_slashcommand([&bot](const dpp::slashcommand_t& event) {
+	bot.on_slashcommand([](const dpp::slashcommand_t& event) {
 		/* Check which command they ran */
 		if (event.command.get_command_name() == "button") {
 			/* Create a message */
@@ -33,7 +33,7 @@ int main() {
 	/* When a user clicks your button, the on_button_click event will fire,
 	 * containing the custom_id you defined in your button.
 	 */
-	bot.on_button_click([&bot](const dpp::button_click_t& event) {
+	bot.on_button_click([](const dpp::button_click_t& event) {
 		/* Button clicks are still interactions, and must be replied to in some form to
 		 * prevent the "this interaction has failed" message from Discord to the user.
  		 */
diff --git a/docpages/example_code/components2.cpp b/docpages/example_code/components2.cpp
@@ -6,7 +6,7 @@ int main() {
 	bot.on_log(dpp::utility::cout_logger());
 
 	/* The event is fired when someone issues your commands */
-	bot.on_slashcommand([&bot](const dpp::slashcommand_t& event) {
+	bot.on_slashcommand([](const dpp::slashcommand_t& event) {
 		/* Check which command they ran */
 		if (event.command.get_command_name() == "math") {
 
@@ -40,7 +40,7 @@ int main() {
 		}
 	});
 
-	bot.on_button_click([&bot](const dpp::button_click_t & event) {
+	bot.on_button_click([](const dpp::button_click_t & event) {
 		if (event.custom_id == "10") {
 			event.reply(dpp::message("You got it right!").set_flags(dpp::m_ephemeral));
 		} else {
diff --git a/docpages/example_code/components3.cpp b/docpages/example_code/components3.cpp
@@ -7,7 +7,7 @@ int main() {
 	bot.on_log(dpp::utility::cout_logger());
 
 	/* The event is fired when someone issues your commands */
-	bot.on_slashcommand([&bot](const dpp::slashcommand_t& event) {
+	bot.on_slashcommand([](const dpp::slashcommand_t& event) {
 		/* Check which command they ran */
 		if (event.command.get_command_name() == "select") {
 			/* Create a message */
@@ -33,7 +33,7 @@ int main() {
 	/* When a user clicks your select menu , the on_select_click event will fire,
 	 * containing the custom_id you defined in your select menu.
 	 */
-	bot.on_select_click([&bot](const dpp::select_click_t & event) {
+	bot.on_select_click([](const dpp::select_click_t & event) {
 		/* Select clicks are still interactions, and must be replied to in some form to
 		 * prevent the "this interaction has failed" message from Discord to the user.
 		 */
diff --git a/docpages/example_code/components3_rolemenu.cpp b/docpages/example_code/components3_rolemenu.cpp
@@ -6,7 +6,7 @@ int main() {
 	bot.on_log(dpp::utility::cout_logger());
 
 	/* The event is fired when someone issues your commands */
-	bot.on_slashcommand([&bot](const dpp::slashcommand_t& event) {
+	bot.on_slashcommand([](const dpp::slashcommand_t& event) {
 		/* Check which command they ran */
 		if (event.command.get_command_name() == "select") {
 			/* Create a message */
diff --git a/docpages/example_code/default_select_value.cpp b/docpages/example_code/default_select_value.cpp
@@ -7,7 +7,7 @@ int main() {
 	bot.on_log(dpp::utility::cout_logger());
 	
 	/* The event is fired when someone issues your commands */
-	bot.on_slashcommand([&bot](const dpp::slashcommand_t& event) {
+	bot.on_slashcommand([](const dpp::slashcommand_t& event) {
 		/* Check which command they ran */
 		if (event.command.get_command_name() == "select") {
 			/* Create a message */
diff --git a/docpages/example_code/detecting_messages.cpp b/docpages/example_code/detecting_messages.cpp
@@ -7,7 +7,7 @@ int main() {
 	bot.on_log(dpp::utility::cout_logger());
 
 	/* The event is fired when the bot detects a message in any server and any channel it has access to. */
-	bot.on_message_create([&bot](const dpp::message_create_t& event) {
+	bot.on_message_create([](const dpp::message_create_t& event) {
 		/* See if the message contains the phrase we want to check for.
 		 * If there's at least a single match, we reply and say it's not allowed.
 		 */
diff --git a/docpages/example_code/editing_message_after_click.cpp b/docpages/example_code/editing_message_after_click.cpp
@@ -7,7 +7,7 @@ int main() {
 	bot.on_log(dpp::utility::cout_logger());
 
 	/* The event is fired when someone issues your commands */
-	bot.on_slashcommand([&bot](const dpp::slashcommand_t& event) {
+	bot.on_slashcommand([](const dpp::slashcommand_t& event) {
 		/* Check which command they ran */
 		if (event.command.get_command_name() == "button") {
 			/* Create a message */
@@ -33,7 +33,7 @@ int main() {
 	/* When a user clicks your button, the on_button_click event will fire,
 	 * containing the custom_id you defined in your button.
 	 */
-	bot.on_button_click([&bot](const dpp::button_click_t& event) {
+	bot.on_button_click([](const dpp::button_click_t& event) {
 		/* Instead of replying to the button click itself,
 		 * we want to update the message that had the buttons on it.
 		 */
diff --git a/docpages/example_code/editing_message_after_click2.cpp b/docpages/example_code/editing_message_after_click2.cpp
@@ -7,7 +7,7 @@ int main() {
 	bot.on_log(dpp::utility::cout_logger());
 
 	/* The event is fired when someone issues your commands */
-	bot.on_slashcommand([&bot](const dpp::slashcommand_t& event) {
+	bot.on_slashcommand([](const dpp::slashcommand_t& event) {
 		/* Check which command they ran */
 		if (event.command.get_command_name() == "button") {
 			/* Create a message */
@@ -33,7 +33,7 @@ int main() {
 	/* When a user clicks your button, the on_button_click event will fire,
 	 * containing the custom_id you defined in your button.
 	 */
-	bot.on_button_click([&bot](const dpp::button_click_t& event) {
+	bot.on_button_click([](const dpp::button_click_t& event) {
 		/* Instead of replying to the button click itself,
 		 * we want to update the message that had the buttons on it.
 		 */
diff --git a/docpages/example_code/embeds.cpp b/docpages/example_code/embeds.cpp
@@ -7,7 +7,7 @@ int main() {
 	bot.on_log(dpp::utility::cout_logger());
 
 	/* The event is fired when someone issues your commands */
-	bot.on_slashcommand([&bot](const dpp::slashcommand_t& event) {
+	bot.on_slashcommand([](const dpp::slashcommand_t& event) {
 		/* Check which command they ran */
 		if (event.command.get_command_name() == "embed") {
 			/* Create an embed */
diff --git a/docpages/example_code/ephemeral.cpp b/docpages/example_code/ephemeral.cpp
@@ -7,7 +7,7 @@ int main() {
 	bot.on_log(dpp::utility::cout_logger());
 
 	/* The event is fired when someone issues your commands */
-	bot.on_slashcommand([&bot](const dpp::slashcommand_t & event) {
+	bot.on_slashcommand([](const dpp::slashcommand_t & event) {
 		/* Check which command they ran */
 		if (event.command.get_command_name() == "hello") {
 			/* Reply to the user, but only let them see the response. */
diff --git a/docpages/example_code/eval.cpp b/docpages/example_code/eval.cpp
@@ -75,7 +75,7 @@ int main() {
 			 * This code assumes the current directory is writeable. The file will have a
 			 * unique name made from the user's id and the message id.
 			 */
-        		std::string source_filename = std::to_string(event.msg.author.id) + "_" + std::to_string(event.msg.id) + ".cpp";
+			std::string source_filename = std::to_string(event.msg.author.id) + "_" + std::to_string(event.msg.id) + ".cpp";
 			std::fstream code_file(source_filename, std::fstream::binary | std::fstream::out);
 			if (!code_file.is_open()) {
 				bot.message_create(dpp::message(event.msg.channel_id, "Unable to create source file for `eval`"));
@@ -96,7 +96,7 @@ int main() {
 				std::to_string(event.msg.author.id) + "_" + std::to_string(event.msg.id) + ".cpp",
 				"-ldpp",
 				"-ldl"
-			}, [event, &bot, source_filename, compile_start](const std::string &output) {
+			}, [event, &bot, compile_start](const std::string &output) {
 
 				/* After g++ is ran we end up inside this lambda with the output as a string */
 				double compile_time = dpp::utility::time_f() - compile_start;
diff --git a/docpages/example_code/modal_dialog_interactions.cpp b/docpages/example_code/modal_dialog_interactions.cpp
@@ -6,7 +6,7 @@ int main() {
 
 	bot.on_log(dpp::utility::cout_logger());
 
-	bot.on_slashcommand([&bot](const dpp::slashcommand_t& event) {
+	bot.on_slashcommand([](const dpp::slashcommand_t& event) {
 		/* Check for our /dialog command */
 		if (event.command.get_command_name() == "dialog") {
 			/* Instantiate an interaction_modal_response object */
diff --git a/docpages/example_code/oggopus2.cpp b/docpages/example_code/oggopus2.cpp
@@ -20,7 +20,7 @@ int main() {
 	bot.on_log(dpp::utility::cout_logger());
 
 	/* The event is fired when someone issues your commands */
-	bot.on_slashcommand([&bot](const dpp::slashcommand_t& event) {
+	bot.on_slashcommand([](const dpp::slashcommand_t& event) {
 
 		/* Check which command they ran */
 		if (event.command.get_command_name() == "join") {
diff --git a/docpages/example_code/record_user.cpp b/docpages/example_code/record_user.cpp
@@ -21,7 +21,7 @@ int main() {
 	bot.on_log(dpp::utility::cout_logger());
 
 	/* The event is fired when someone issues your commands */
-	bot.on_slashcommand([&bot, &fd](const dpp::slashcommand_t& event) {
+	bot.on_slashcommand([&fd](const dpp::slashcommand_t& event) {
 		/* Check which command they ran */
 		if (event.command.get_command_name() == "record") {
 			/* Get the guild */
diff --git a/docpages/example_code/slashcommands1.cpp b/docpages/example_code/slashcommands1.cpp
@@ -6,7 +6,7 @@ int main() {
 	bot.on_log(dpp::utility::cout_logger());
 
 	/* The event is fired when someone issues your commands */
-	bot.on_slashcommand([&bot](const dpp::slashcommand_t & event) {
+	bot.on_slashcommand([](const dpp::slashcommand_t & event) {
 		/* Check which command they ran */
 		if (event.command.get_command_name() == "blep") {
 			/* Fetch a parameter value from the command parameters */
diff --git a/docpages/example_code/slashcommands2.cpp b/docpages/example_code/slashcommands2.cpp
@@ -6,7 +6,7 @@ int main() {
 	bot.on_log(dpp::utility::cout_logger());
 
 	/* The event is fired when someone issues your commands */
-	bot.on_slashcommand([&bot](const dpp::slashcommand_t & event) {
+	bot.on_slashcommand([](const dpp::slashcommand_t & event) {
 		/* Check which command they ran */
 		if (event.command.get_command_name() == "blep") {
 			/* Fetch a parameter value from the command parameters */
diff --git a/docpages/example_code/subcommands.cpp b/docpages/example_code/subcommands.cpp
@@ -7,7 +7,7 @@ int main() {
 	bot.on_log(dpp::utility::cout_logger());
 
 	/* Use the on_slashcommand event to look for commands */
-	bot.on_slashcommand([&bot](const dpp::slashcommand_t & event) {
+	bot.on_slashcommand([](const dpp::slashcommand_t & event) {
 		dpp::command_interaction cmd_data = event.command.get_command_interaction();
 
 		/* Check if the command is the image command. */
diff --git a/docpages/example_code/thinking.cpp b/docpages/example_code/thinking.cpp
@@ -6,7 +6,7 @@ int main() {
 	bot.on_log(dpp::utility::cout_logger());
 
 	/* The event is fired when someone issues your commands */
-	bot.on_slashcommand([&bot](const dpp::slashcommand_t& event) {
+	bot.on_slashcommand([](const dpp::slashcommand_t& event) {
 		/* Check which command they ran */
 		if (event.command.get_command_name() == "thinking") {
 			/*
diff --git a/docpages/example_code/upload_parameter.cpp b/docpages/example_code/upload_parameter.cpp
@@ -6,7 +6,7 @@ int main() {
 	bot.on_log(dpp::utility::cout_logger());
 
 	/* The event is fired when someone issues your commands */
-	bot.on_slashcommand([&bot](const dpp::slashcommand_t& event) {
+	bot.on_slashcommand([](const dpp::slashcommand_t& event) {
 		/* Check which command they ran */
 		if (event.command.get_command_name() == "show") {
 			/* Get the file id from the parameter attachment. */
diff --git a/docpages/example_code/using_modules.cpp b/docpages/example_code/using_modules.cpp
@@ -1,22 +1,21 @@
-/* If import std; is supported, use it instead */
-#include <cstdlib>
-
 import dpp;
 
 using dpp::cluster;
+using std::ready_t;
 using dpp::slashcommand;
+using dpp::slashcommand_t;
 using dpp::start_type;
 
 int main() {
-	cluster bot(std::getenv("BOT_TOKEN"));
+	cluster bot("YOUR_BOT_TOKEN_HERE");
 
-	bot.on_slashcommand([](auto event) {
+	bot.on_slashcommand([](const slashcommand_t& event) -> void {
 		if (event.command.get_command_name() == "ping") {
 			event.reply("Pong!");
 		}
 	});
 
-	bot.on_ready([&bot](auto event) {
+	bot.on_ready([&bot](const ready_t& event) -> void {
 		if (dpp::run_once<struct register_bot_commands>()) {
 			bot.global_command_create(
 				slashcommand("ping", "Ping pong!", bot.me.id)
@@ -26,4 +25,4 @@ int main() {
 
 	bot.start(start_type::st_wait);
 	return 0;
-}
+}
diff --git a/docpages/example_programs/misc/using_modules.md b/docpages/example_programs/misc/using_modules.md
@@ -2,7 +2,7 @@
 
 D++ is offered as a C++ module, which offers improved compile times over a traditional header.
 
-In order to enable support, you should be using C++20+ with any module-supporting compiler. To activate the feature, pass the `DPP_MODULES` flag to CMake. Ensure that the generated build system supports modules (for CMake, this is usually Ninja).
+In order to enable support, you must use C++20 (or later) with any module-supporting compiler. To activate the feature, pass the `DPP_MODULES` flag to CMake. Ensure that the generated build system supports modules (for CMake, this is usually Ninja; note CMake does not currently support modules with Makefile).
 
 Once this is done, simply `import dpp;` and we're good to go!
 
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
diff --git a/src/unittest/module_test.cpp b/src/unittest/module_test.cpp
diff --git a/src/unittest/test.cpp b/src/unittest/test.cpp
diff --git a/src/unittest/test.h b/src/unittest/test.h
