Repository navigation
main build red: conflict markers left in native_module.rs after diagnostics_channel tail APIs #3864
Description
Summary
Latest origin/main does not build, which blocks the Node API compatibility/parity sweep from producing current-main evidence.
The current tip contains merge-conflict markers in crates/perry-runtime/src/object/native_module.rs inside cjs_default_export_value.
Local evidence
Current fetched main:
d4f2903fa567 fix(diagnostics_channel): add Node 26 tail APIs (#3858)
Build command:
cargo build --release -p perry -p perry-runtime -p perry-stdlibCompiler error:
error: this file contains an unclosed delimiter
--> crates/perry-runtime/src/object/native_module.rs:5255:3
|
1448 | fn cjs_default_export_value(module_name: &str) -> Option<f64> {
| - unclosed delimiter
1449 | match module_name {
| - unclosed delimiter
...
1455 | "async_hooks" | "constants" | "os" | "path" | "querystring" | "url" | "util" => {
| - this delimiter might not be properly closed...
Relevant source excerpt:
1451 <<<<<<< HEAD
1452 "async_hooks" | "constants" | "os" | "path" | "querystring" | "url" | "util" => {
1453 =======
1454 <<<<<<< HEAD
1455 "async_hooks" | "constants" | "os" | "path" | "querystring" | "url" | "util" => {
1456 =======
1457 "async_hooks" | "os" | "path" | "punycode" | "querystring" | "url" | "util" => {
1458 >>>>>>> origin/main
1459 >>>>>>> origin/main
1460 create_cjs_default_namespace(module_name)
Acceptance criteria
- Remove the conflict markers and choose the intended CJS default namespace module list.
cargo build --release -p perry -p perry-runtime -p perry-stdlibsucceeds onorigin/main.- The diagnostics_channel Node 26 tail API tests from fix(diagnostics_channel): add Node 26 tail APIs #3858 still pass.
Activity
andrewtdiz commentedon May 31, 2026
Update after the hotfix on current
origin/main:cargo build --release -p perry -p perry-runtime -p perry-stdlibis still red. The earliercjs_default_export_valuehunk appears fixed, but another conflict marker remains incrates/perry-runtime/src/object/native_module.rsaround namespace keys:Source excerpt:
This still blocks current-main Node API parity evidence; I am continuing the compatibility sweep on the last buildable main and labeling evidence accordingly until
origin/mainbuilds again.andrewtdiz commentedon May 31, 2026
I am taking this with #3868 as a focused native-module surface cleanup. Planned scope: remove the remaining committed conflict-marker hunk in
native_module.rs, preserve bothpunycodeandtimersnamespace keys, and verify the repaired base while also fixing the relatednode:sysdefault alias identity path.andrewtdiz commentedon May 31, 2026
Implemented in #3874. The PR removes the remaining committed conflict-marker hunk in
native_module.rs, preserves bothpunycodeandtimersnamespace keys, and verifies that the release build succeeds plus the diagnostics_channel tail fixtures from #3858 still pass.