Skip to content

fix: merge custom modules correctly - #354

Open
Times-Z wants to merge 1 commit into
wayle-rs:masterfrom
Times-Z:fix/custom-modules-merge
Open

fix: merge custom modules correctly#354
Times-Z wants to merge 1 commit into
wayle-rs:masterfrom
Times-Z:fix/custom-modules-merge

Conversation

@Times-Z

@Times-Z Times-Z commented Aug 25, 2026

Copy link
Copy Markdown
Contributor

Objective

Fixes #353

Merge [[modules.custom]] entries defined across multiple imported TOML files so that all custom modules are available in the bar.

Solution

Updated the TOML configuration merge logic to concatenate arrays under modules.custom across imports.

Other arrays retain the existing overlay behavior, where the later configuration takes precedence.

Added regression tests covering:

  • Merging custom modules from multiple imports
  • Preserving replacement behavior for non-custom arrays

No visual changes

Test Plan

  • cargo fmt --all -- --check
  • cargo test -p wayle-config
  • cargo test -p wayle-config infrastructure::loading::merging
  • cargo clippy --workspace

@Times-Z

Times-Z commented Aug 25, 2026

Copy link
Copy Markdown
Contributor Author

Mmh, CI fails are not related to my changes, do you wan me to fix them ?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[[modules.custom]] entries from separate imported files are not merged

1 participant