Dummy commit.

Author: Alexhuszagh

docs/cross_toml.md

@@ -21,6 +21,7 @@ For example:
 
 ```toml
 [build.env]
+complete-cargo-config = true
 ignore-cargo-config = false
 volumes = ["VOL1_ARG", "VOL2_ARG"]
 passthrough = ["IMPORTANT_ENV_VARIABLES"]

src/cross_config.rs

@@ -1,6 +1,7 @@
 use std::collections::HashMap;
 
 use crate::config::{bool_from_envvar, split_to_cloned_by_ws, Environment};
+use crate::cross_toml::CargoConfigBehavior;
 use crate::docker::custom::PreBuild;
 use crate::shell::MessageInfo;
 use crate::{CrossToml, Result, Target, TargetList};
@@ -84,6 +85,13 @@ impl CrossEnvironment {
         self.get_target_var(target, "RUNNER")
     }
 
+    // TODO(ahuszagh) Need to change this.
+    //  Need to have an enum here.
+
+    fn complete_cargo_config(&self, target: &Target) -> (Option<bool>, Option<bool>) {
+        self.get_values_for("ENV_COMPLETE_CARGO_CONFIG", target, bool_from_envvar)
+    }
+
     fn ignore_cargo_config(&self, target: &Target) -> (Option<bool>, Option<bool>) {
         self.get_values_for("ENV_IGNORE_CARGO_CONFIG", target, bool_from_envvar)
     }
@@ -272,6 +280,17 @@ impl CrossConfig {
         self.env.custom_toolchain()
     }
 
+    // TODO(ahuszagh) This should actually be an enough
+    //  Ignore, default, complete.
+
+    pub fn env_complete_cargo_config(&self, target: &Target) -> Option<bool> {
+        self.bool_from_config(
+            target,
+            CrossEnvironment::complete_cargo_config,
+            CrossToml::env_complete_cargo_config,
+        )
+    }
+
     pub fn env_ignore_cargo_config(&self, target: &Target) -> Option<bool> {
         self.bool_from_config(
             target,

src/cross_toml.rs

@@ -17,6 +17,9 @@ use serde::{Deserialize, Deserializer, Serialize};
 #[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Default)]
 #[serde(rename_all = "kebab-case")]
 pub struct CrossEnvConfig {
+    // TODO(ahuszagh) Change to an enum
+    cargo_config: Option<CargoConfigBehavior>,
+    complete_cargo_config: Option<bool>,
     ignore_cargo_config: Option<bool>,
     volumes: Option<Vec<String>>,
     passthrough: Option<Vec<String>>,
@@ -84,6 +87,34 @@ pub struct CrossToml {
     pub build: CrossBuildConfig,
 }
 
+#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Clone, Copy)]
+#[serde(rename_all = "kebab-case")]
+pub enum CargoConfigBehavior {
+    Ignore,
+    #[serde(rename = "default")]
+    Normal,
+    Complete,
+}
+
+impl Default for CargoConfigBehavior {
+    fn default() -> CargoConfigBehavior {
+        CargoConfigBehavior::Normal
+    }
+}
+
+impl FromStr for CargoConfigBehavior {
+    type Err = eyre::Error;
+
+    fn from_str(s: &str) -> Result<CargoConfigBehavior> {
+        match s {
+            "ignore" => Ok(CargoConfigBehavior::Ignore),
+            "default" => Ok(CargoConfigBehavior::Normal),
+            "complete" => Ok(CargoConfigBehavior::Complete),
+            _ => eyre::bail!("invalid cargo config behavior, got {s}"),
+        }
+    }
+}
+
 impl CrossToml {
     /// Obtains the [`CrossToml`] from one of the possible locations
     ///
@@ -324,6 +355,24 @@ impl CrossToml {
         self.get_value(target, |b| b.build_std, |t| t.build_std)
     }
 
+    /// Returns the cargo config behavior.
+    pub fn env_cargo_config(&self, target: &Target) -> (Option<CargoConfigBehavior>, Option<CargoConfigBehavior>) {
+        self.get_value(
+            target,
+            |b| b.env.cargo_config,
+            |t| t.env.cargo_config,
+        )
+    }
+
+    /// Returns the whether to use the complete cargo config settings.
+    pub fn env_complete_cargo_config(&self, target: &Target) -> (Option<bool>, Option<bool>) {
+        self.get_value(
+            target,
+            |b| b.env.complete_cargo_config,
+            |t| t.env.complete_cargo_config,
+        )
+    }
+
     /// Returns the whether to ignore cargo config files.
     pub fn env_ignore_cargo_config(&self, target: &Target) -> (Option<bool>, Option<bool>) {
         self.get_value(
@@ -529,6 +578,18 @@ mod tests {
         };
     }
 
+    #[test]
+    pub fn test_toml_cargo_config_behavior() -> Result<()> {
+        assert_eq!(CargoConfigBehavior::Normal, toml::from_str("\"default\"")?);
+        assert_eq!(CargoConfigBehavior::Ignore, toml::from_str("\"ignore\"")?);
+        assert_eq!(CargoConfigBehavior::Complete, toml::from_str("\"complete\"")?);
+        assert!(toml::from_str::<CargoConfigBehavior>("\"other\"").is_err());
+        assert!(toml::from_str::<CargoConfigBehavior>("true").is_err());
+        assert!(toml::from_str::<CargoConfigBehavior>("0").is_err());
+
+        Ok(())
+    }
+
     #[test]
     pub fn parse_empty_toml() -> Result<()> {
         let cfg = CrossToml {
@@ -549,6 +610,9 @@ mod tests {
             targets: HashMap::new(),
             build: CrossBuildConfig {
                 env: CrossEnvConfig {
+                    // TODO(ahuszagh) Remove
+                    cargo_config: None,
+                    complete_cargo_config: None,
                     ignore_cargo_config: Some(false),
                     volumes: Some(vec![s!("VOL1_ARG"), s!("VOL2_ARG")]),
                     passthrough: Some(vec![s!("VAR1"), s!("VAR2")]),
@@ -588,6 +652,9 @@ mod tests {
             },
             CrossTargetConfig {
                 env: CrossEnvConfig {
+                    // TODO(ahuszagh) Remove
+                    cargo_config: None,
+                    complete_cargo_config: None,
                     ignore_cargo_config: None,
                     passthrough: Some(vec![s!("VAR1"), s!("VAR2")]),
                     volumes: Some(vec![s!("VOL1_ARG"), s!("VOL2_ARG")]),
@@ -643,6 +710,9 @@ mod tests {
                 pre_build: Some(PreBuild::Lines(vec![s!("echo 'Hello'")])),
                 runner: None,
                 env: CrossEnvConfig {
+                    // TODO(ahuszagh) Remove
+                    cargo_config: None,
+                    complete_cargo_config: None,
                     ignore_cargo_config: None,
                     passthrough: None,
                     volumes: Some(vec![s!("VOL")]),
@@ -654,6 +724,9 @@ mod tests {
             targets: target_map,
             build: CrossBuildConfig {
                 env: CrossEnvConfig {
+                    // TODO(ahuszagh) Remove
+                    cargo_config: None,
+                    complete_cargo_config: None,
                     ignore_cargo_config: Some(true),
                     volumes: None,
                     passthrough: Some(vec![]),
@@ -714,6 +787,9 @@ mod tests {
             targets: HashMap::new(),
             build: CrossBuildConfig {
                 env: CrossEnvConfig {
+                    // TODO(ahuszagh) Remove
+                    cargo_config: None,
+                    complete_cargo_config: None,
                     ignore_cargo_config: None,
                     passthrough: None,
                     volumes: None,