diff options
| author | onur-ozkan <work@onurozkan.dev> | 2025-04-15 19:10:31 +0300 |
|---|---|---|
| committer | onur-ozkan <work@onurozkan.dev> | 2025-04-15 19:10:31 +0300 |
| commit | 6d52b51d3e6321b7a1d24e5f995aa709057153e3 (patch) | |
| tree | c2d5ce88db0c632db006c5f6f825860cf8dc3781 | |
| parent | 7dfb457745d7f873eb5db1c3fb39d58fa768740d (diff) | |
| download | rust-6d52b51d3e6321b7a1d24e5f995aa709057153e3.tar.gz rust-6d52b51d3e6321b7a1d24e5f995aa709057153e3.zip | |
add comment in `TomlConfig::merge` about the merge order
Signed-off-by: onur-ozkan <work@onurozkan.dev>
| -rw-r--r-- | src/bootstrap/src/core/config/config.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs index b7afd81dfdb..e15aab4ad50 100644 --- a/src/bootstrap/src/core/config/config.rs +++ b/src/bootstrap/src/core/config/config.rs @@ -805,6 +805,8 @@ impl Merge for TomlConfig { .and_then(|p| p.parent().map(ToOwned::to_owned)) .unwrap_or_default(); + // `include` handled later since we ignore duplicates using `ReplaceOpt::IgnoreDuplicate` to + // keep the upper-level configuration to take precedence. for include_path in include.clone().unwrap_or_default().iter().rev() { let include_path = parent_dir.join(include_path); let include_path = include_path.canonicalize().unwrap_or_else(|e| { |