refactor(toml): Move Profile layering to be part of schema API

Author: epage

src/cargo/util/toml/mod.rs

@@ -2141,98 +2141,6 @@ fn validate_profile_override(profile: &schema::TomlProfile, which: &str) -> Carg
     Ok(())
 }
 
-impl schema::TomlProfile {
-    /// Overwrite self's values with the given profile.
-    pub fn merge(&mut self, profile: &schema::TomlProfile) {
-        if let Some(v) = &profile.opt_level {
-            self.opt_level = Some(v.clone());
-        }
-
-        if let Some(v) = &profile.lto {
-            self.lto = Some(v.clone());
-        }
-
-        if let Some(v) = &profile.codegen_backend {
-            self.codegen_backend = Some(v.clone());
-        }
-
-        if let Some(v) = profile.codegen_units {
-            self.codegen_units = Some(v);
-        }
-
-        if let Some(v) = profile.debug {
-            self.debug = Some(v);
-        }
-
-        if let Some(v) = profile.debug_assertions {
-            self.debug_assertions = Some(v);
-        }
-
-        if let Some(v) = &profile.split_debuginfo {
-            self.split_debuginfo = Some(v.clone());
-        }
-
-        if let Some(v) = profile.rpath {
-            self.rpath = Some(v);
-        }
-
-        if let Some(v) = &profile.panic {
-            self.panic = Some(v.clone());
-        }
-
-        if let Some(v) = profile.overflow_checks {
-            self.overflow_checks = Some(v);
-        }
-
-        if let Some(v) = profile.incremental {
-            self.incremental = Some(v);
-        }
-
-        if let Some(v) = &profile.rustflags {
-            self.rustflags = Some(v.clone());
-        }
-
-        if let Some(other_package) = &profile.package {
-            match &mut self.package {
-                Some(self_package) => {
-                    for (spec, other_pkg_profile) in other_package {
-                        match self_package.get_mut(spec) {
-                            Some(p) => p.merge(other_pkg_profile),
-                            None => {
-                                self_package.insert(spec.clone(), other_pkg_profile.clone());
-                            }
-                        }
-                    }
-                }
-                None => self.package = Some(other_package.clone()),
-            }
-        }
-
-        if let Some(other_bo) = &profile.build_override {
-            match &mut self.build_override {
-                Some(self_bo) => self_bo.merge(other_bo),
-                None => self.build_override = Some(other_bo.clone()),
-            }
-        }
-
-        if let Some(v) = &profile.inherits {
-            self.inherits = Some(v.clone());
-        }
-
-        if let Some(v) = &profile.dir_name {
-            self.dir_name = Some(v.clone());
-        }
-
-        if let Some(v) = &profile.strip {
-            self.strip = Some(v.clone());
-        }
-
-        if let Some(v) = &profile.trim_paths {
-            self.trim_paths = Some(v.clone())
-        }
-    }
-}
-
 impl schema::InheritableLints {
     fn inherit_with<'a>(
         self,

src/cargo/util/toml/schema.rs

@@ -670,6 +670,98 @@ pub struct TomlProfile {
     pub trim_paths: Option<TomlTrimPaths>,
 }
 
+impl TomlProfile {
+    /// Overwrite self's values with the given profile.
+    pub fn merge(&mut self, profile: &Self) {
+        if let Some(v) = &profile.opt_level {
+            self.opt_level = Some(v.clone());
+        }
+
+        if let Some(v) = &profile.lto {
+            self.lto = Some(v.clone());
+        }
+
+        if let Some(v) = &profile.codegen_backend {
+            self.codegen_backend = Some(v.clone());
+        }
+
+        if let Some(v) = profile.codegen_units {
+            self.codegen_units = Some(v);
+        }
+
+        if let Some(v) = profile.debug {
+            self.debug = Some(v);
+        }
+
+        if let Some(v) = profile.debug_assertions {
+            self.debug_assertions = Some(v);
+        }
+
+        if let Some(v) = &profile.split_debuginfo {
+            self.split_debuginfo = Some(v.clone());
+        }
+
+        if let Some(v) = profile.rpath {
+            self.rpath = Some(v);
+        }
+
+        if let Some(v) = &profile.panic {
+            self.panic = Some(v.clone());
+        }
+
+        if let Some(v) = profile.overflow_checks {
+            self.overflow_checks = Some(v);
+        }
+
+        if let Some(v) = profile.incremental {
+            self.incremental = Some(v);
+        }
+
+        if let Some(v) = &profile.rustflags {
+            self.rustflags = Some(v.clone());
+        }
+
+        if let Some(other_package) = &profile.package {
+            match &mut self.package {
+                Some(self_package) => {
+                    for (spec, other_pkg_profile) in other_package {
+                        match self_package.get_mut(spec) {
+                            Some(p) => p.merge(other_pkg_profile),
+                            None => {
+                                self_package.insert(spec.clone(), other_pkg_profile.clone());
+                            }
+                        }
+                    }
+                }
+                None => self.package = Some(other_package.clone()),
+            }
+        }
+
+        if let Some(other_bo) = &profile.build_override {
+            match &mut self.build_override {
+                Some(self_bo) => self_bo.merge(other_bo),
+                None => self.build_override = Some(other_bo.clone()),
+            }
+        }
+
+        if let Some(v) = &profile.inherits {
+            self.inherits = Some(v.clone());
+        }
+
+        if let Some(v) = &profile.dir_name {
+            self.dir_name = Some(v.clone());
+        }
+
+        if let Some(v) = &profile.strip {
+            self.strip = Some(v.clone());
+        }
+
+        if let Some(v) = &profile.trim_paths {
+            self.trim_paths = Some(v.clone())
+        }
+    }
+}
+
 #[derive(Clone, Debug, PartialEq, Eq, Ord, PartialOrd, Hash)]
 pub enum ProfilePackageSpec {
     Spec(PackageIdSpec),