Skip to content

Commit 6d52b51

Browse files
committed
add comment in TomlConfig::merge about the merge order
Signed-off-by: onur-ozkan <[email protected]>
1 parent 7dfb457 commit 6d52b51

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

Diff for: src/bootstrap/src/core/config/config.rs

+2
Original file line numberDiff line numberDiff line change
@@ -805,6 +805,8 @@ impl Merge for TomlConfig {
805805
.and_then(|p| p.parent().map(ToOwned::to_owned))
806806
.unwrap_or_default();
807807

808+
// `include` handled later since we ignore duplicates using `ReplaceOpt::IgnoreDuplicate` to
809+
// keep the upper-level configuration to take precedence.
808810
for include_path in include.clone().unwrap_or_default().iter().rev() {
809811
let include_path = parent_dir.join(include_path);
810812
let include_path = include_path.canonicalize().unwrap_or_else(|e| {

0 commit comments

Comments
 (0)