make it clear that the CrossToml parse functions parse from strings

Author: Emilgardis

src/config.rs

@@ -603,7 +603,7 @@ mod tests {
 
         fn toml(content: &str) -> Result<crate::CrossToml> {
             Ok(
-                CrossToml::parse_from_cross(content, &mut MessageInfo::default())
+                CrossToml::parse_from_cross_str(content, &mut MessageInfo::default())
                     .wrap_err("couldn't parse toml")?
                     .0,
             )

src/cross_toml.rs

@@ -123,23 +123,23 @@ pub struct CrossToml {
 
 impl CrossToml {
     /// Parses the [`CrossToml`] from all of the config sources
-    pub fn parse(
+    pub fn parse_str(
         cargo_toml: &str,
         cross_toml: &str,
         msg_info: &mut MessageInfo,
     ) -> Result<(Self, BTreeSet<String>)> {
-        let (cross_toml, mut unused) = Self::parse_from_cross(cross_toml, msg_info)?;
+        let (cross_toml, mut unused) = Self::parse_from_cross_str(cross_toml, msg_info)?;
 
-        if let Some((cargo_toml, u_cargo)) = Self::parse_from_cargo(cargo_toml, msg_info)? {
-            unused.extend(u_cargo);
+        if let Some((cargo_toml, u_cargo)) = Self::parse_from_cargo_str(cargo_toml, msg_info)? {
+            unused.extend(u_cargo.into_iter());
             Ok((cargo_toml.merge(cross_toml)?, unused))
         } else {
             Ok((cross_toml, unused))
         }
     }
 
     /// Parses the [`CrossToml`] from a string
-    pub fn parse_from_cross(
+    pub fn parse_from_cross_str(
         toml_str: &str,
         msg_info: &mut MessageInfo,
     ) -> Result<(Self, BTreeSet<String>)> {
@@ -148,7 +148,7 @@ impl CrossToml {
     }
 
     /// Parses the [`CrossToml`] from a string containing the Cargo.toml contents
-    pub fn parse_from_cargo(
+    pub fn parse_from_cargo_str(
         cargo_toml_str: &str,
         msg_info: &mut MessageInfo,
     ) -> Result<Option<(Self, BTreeSet<String>)>> {
@@ -598,7 +598,7 @@ mod tests {
             targets: HashMap::new(),
             build: CrossBuildConfig::default(),
         };
-        let (parsed_cfg, unused) = CrossToml::parse_from_cross("", &mut m!())?;
+        let (parsed_cfg, unused) = CrossToml::parse_from_cross_str("", &mut m!())?;
 
         assert_eq!(parsed_cfg, cfg);
         assert!(unused.is_empty());
@@ -633,7 +633,7 @@ mod tests {
           volumes = ["VOL1_ARG", "VOL2_ARG"]
           passthrough = ["VAR1", "VAR2"]
         "#;
-        let (parsed_cfg, unused) = CrossToml::parse_from_cross(test_str, &mut m!())?;
+        let (parsed_cfg, unused) = CrossToml::parse_from_cross_str(test_str, &mut m!())?;
 
         assert_eq!(parsed_cfg, cfg);
         assert!(unused.is_empty());
@@ -705,7 +705,7 @@ mod tests {
             version = "2.17"
             image = "zig:local"
         "#;
-        let (parsed_cfg, unused) = CrossToml::parse_from_cross(test_str, &mut m!())?;
+        let (parsed_cfg, unused) = CrossToml::parse_from_cross_str(test_str, &mut m!())?;
 
         assert_eq!(parsed_cfg, cfg);
         assert!(unused.is_empty());
@@ -791,7 +791,7 @@ mod tests {
             [target.aarch64-unknown-linux-gnu.env]
             volumes = ["VOL"]
         "#;
-        let (parsed_cfg, unused) = CrossToml::parse_from_cross(test_str, &mut m!())?;
+        let (parsed_cfg, unused) = CrossToml::parse_from_cross_str(test_str, &mut m!())?;
 
         assert_eq!(parsed_cfg, cfg);
         assert!(unused.is_empty());
@@ -810,7 +810,7 @@ mod tests {
           cross = "1.2.3"
         "#;
 
-        let res = CrossToml::parse_from_cargo(test_str, &mut m!())?;
+        let res = CrossToml::parse_from_cargo_str(test_str, &mut m!())?;
         assert!(res.is_none());
 
         Ok(())
@@ -846,7 +846,7 @@ mod tests {
           xargo = true
         "#;
 
-        if let Some((parsed_cfg, _unused)) = CrossToml::parse_from_cargo(test_str, &mut m!())? {
+        if let Some((parsed_cfg, _unused)) = CrossToml::parse_from_cargo_str(test_str, &mut m!())? {
             assert_eq!(parsed_cfg, cfg);
         } else {
             panic!("Parsing result is None");
@@ -977,9 +977,9 @@ mod tests {
         "#;
 
         // Parses configs
-        let (cfg1, _) = CrossToml::parse_from_cross(cfg1_str, &mut m!())?;
-        let (cfg2, _) = CrossToml::parse_from_cross(cfg2_str, &mut m!())?;
-        let (cfg_expected, _) = CrossToml::parse_from_cross(cfg_expected_str, &mut m!())?;
+        let (cfg1, _) = CrossToml::parse_from_cross_str(cfg1_str, &mut m!())?;
+        let (cfg2, _) = CrossToml::parse_from_cross_str(cfg2_str, &mut m!())?;
+        let (cfg_expected, _) = CrossToml::parse_from_cross_str(cfg_expected_str, &mut m!())?;
 
         // Merges config and compares
         let cfg_merged = cfg1.merge(cfg2)?;
@@ -1036,7 +1036,7 @@ mod tests {
             [build]
             pre-build = ["echo Hello World"]
         "#;
-        let (toml, unused) = CrossToml::parse_from_cross(toml_str, &mut m!())?;
+        let (toml, unused) = CrossToml::parse_from_cross_str(toml_str, &mut m!())?;
         assert!(unused.is_empty());
         assert!(matches!(
             toml.pre_build(&Target::new_built_in("aarch64-unknown-linux-gnu")),

src/lib.rs

@@ -912,7 +912,7 @@ pub fn toml(metadata: &CargoMetadata, msg_info: &mut MessageInfo) -> Result<Opti
         let cross_toml_str = file::read(&cross_config_path)
             .wrap_err_with(|| format!("could not read file `{cross_config_path:?}`"))?;
 
-        let (config, _) = CrossToml::parse(&cargo_toml_str, &cross_toml_str, msg_info)
+        let (config, _) = CrossToml::parse_str(&cargo_toml_str, &cross_toml_str, msg_info)
             .wrap_err_with(|| format!("failed to parse file `{cross_config_path:?}` as TOML",))?;
 
         Ok(Some(config))
@@ -922,7 +922,7 @@ pub fn toml(metadata: &CargoMetadata, msg_info: &mut MessageInfo) -> Result<Opti
             msg_info.warn("There's a file named cross.toml, instead of Cross.toml. You may want to rename it, or it won't be considered.")?;
         }
 
-        if let Some((cfg, _)) = CrossToml::parse_from_cargo(&cargo_toml_str, msg_info)? {
+        if let Some((cfg, _)) = CrossToml::parse_from_cargo_str(&cargo_toml_str, msg_info)? {
             Ok(Some(cfg))
         } else {
             Ok(None)

src/tests/toml.rs

@@ -62,9 +62,9 @@ fn toml_check() -> Result<(), Box<dyn std::error::Error>> {
             );
             let mut msg_info = crate::shell::MessageInfo::default();
             let toml = if !cargo {
-                crate::cross_toml::CrossToml::parse_from_cross(&fence_content, &mut msg_info)?
+                crate::cross_toml::CrossToml::parse_from_cross_str(&fence_content, &mut msg_info)?
             } else {
-                crate::cross_toml::CrossToml::parse_from_cargo(&fence_content, &mut msg_info)?
+                crate::cross_toml::CrossToml::parse_from_cargo_str(&fence_content, &mut msg_info)?
                     .unwrap_or_default()
             };
             assert!(toml.1.is_empty());