apply nit notes

Signed-off-by: onur-ozkan <[email protected]>

Author: onur-ozkan

bootstrap.example.toml

@@ -22,6 +22,9 @@
 # Inherits configuration values from different configuration files (a.k.a. config extensions).
 # Supports absolute paths, and uses the current directory (where the bootstrap was invoked)
 # as the base if the given path is not absolute.
+#
+# The overriding logic follows a right-to-left order. For example, in `include = ["a.toml", "b.toml"]`,
+# extension `b.toml` overrides `a.toml`. Also, parent extensions always overrides the inner ones.
 #include = []
 
 # Keeps track of major changes made to this configuration.

src/bootstrap/src/core/config/config.rs

@@ -771,12 +771,11 @@ impl Merge for TomlConfig {
             }
         }
 
-        for include_path in include.clone().unwrap_or_default() {
+        for include_path in include.clone().unwrap_or_default().iter().rev() {
+            let include_path = include_path.canonicalize().unwrap();
+
             let included_toml = Config::get_toml(&include_path).unwrap_or_else(|e| {
-                eprintln!(
-                    "ERROR: Failed to parse default config profile at '{}': {e}",
-                    include_path.display()
-                );
+                eprintln!("ERROR: Failed to parse '{}': {e}", include_path.display());
                 exit!(2);
             });
 
@@ -786,7 +785,7 @@ impl Merge for TomlConfig {
                 include_path.display()
             );
 
-            self.merge(included_extensions, included_toml, ReplaceOpt::Override);
+            self.merge(included_extensions, included_toml, ReplaceOpt::IgnoreDuplicate);
 
             included_extensions.remove(&include_path);
         }
@@ -1608,6 +1607,14 @@ impl Config {
             toml.profile = Some("dist".into());
         }
 
+        for include_path in toml.include.clone().unwrap_or_default().iter().rev() {
+            let included_toml = get_toml(include_path).unwrap_or_else(|e| {
+                eprintln!("ERROR: Failed to parse '{}': {e}", include_path.display());
+                exit!(2);
+            });
+            toml.merge(&mut Default::default(), included_toml, ReplaceOpt::IgnoreDuplicate);
+        }
+
         if let Some(include) = &toml.profile {
             // Allows creating alias for profile names, allowing
             // profiles to be renamed while maintaining back compatibility
@@ -1632,17 +1639,6 @@ impl Config {
             toml.merge(&mut Default::default(), included_toml, ReplaceOpt::IgnoreDuplicate);
         }
 
-        for include_path in toml.include.clone().unwrap_or_default() {
-            let included_toml = get_toml(&include_path).unwrap_or_else(|e| {
-                eprintln!(
-                    "ERROR: Failed to parse default config profile at '{}': {e}",
-                    include_path.display()
-                );
-                exit!(2);
-            });
-            toml.merge(&mut Default::default(), included_toml, ReplaceOpt::Override);
-        }
-
         let mut override_toml = TomlConfig::default();
         for option in flags.set.iter() {
             fn get_table(option: &str) -> Result<TomlConfig, toml::de::Error> {