From 62541ab468b0f8f7d4bf5ba8d28f76e15cadcc14 Mon Sep 17 00:00:00 2001 From: jserfeng <1114550440@qq.com> Date: Tue, 14 Jul 2026 13:10:56 +0800 Subject: [PATCH] test: add merge conflict fixture --- crates/rspack_plugin_esm_library/src/link.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/rspack_plugin_esm_library/src/link.rs b/crates/rspack_plugin_esm_library/src/link.rs index fe4bfe529650..03c37a85db29 100644 --- a/crates/rspack_plugin_esm_library/src/link.rs +++ b/crates/rspack_plugin_esm_library/src/link.rs @@ -627,7 +627,7 @@ impl EsmLibraryPlugin { // webpack require iterate the needed_namespace_objects and mutate `needed_namespace_objects` // at the same time, https://github.com/webpack/webpack/blob/1f99ad6367f2b8a6ef17cce0e058f7a67fb7db18/lib/optimize/ConcatenatedModule.js#L1514 - // Which is impossible in rust, using a fixed point algorithm to reach the same goal. + // Rust cannot mutate the collection while iterating, so repeat until no new module is found. loop { let mut changed = false;