update the toml dependency

and fix failing tests

Author: giacomocavalieri

Cargo.lock

@@ -52,13 +52,29 @@ impl<'de> Deserialize<'de> for SpdxLicense {
     where
         D: serde::Deserializer<'de>,
     {
-        let s: &str = Deserialize::deserialize(deserializer)?;
-        match spdx::license_id(s) {
+        deserializer.deserialize_str(SpdxLicenseVisitor)
+    }
+}
+
+struct SpdxLicenseVisitor;
+
+impl<'de> serde::de::Visitor<'de> for SpdxLicenseVisitor {
+    type Value = SpdxLicense;
+
+    fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
+        formatter.write_str("a SPDX License ID")
+    }
+
+    fn visit_str<E>(self, value: &str) -> Result<Self::Value, E>
+    where
+        E: serde::de::Error,
+    {
+        match spdx::license_id(value) {
             None => Err(serde::de::Error::custom(format!(
-                "{s} is not a valid SPDX License ID"
+                "{value} is not a valid SPDX License ID"
             ))),
             Some(_) => Ok(SpdxLicense {
-                licence: String::from(s),
+                licence: value.to_string(),
             }),
         }
     }
@@ -341,10 +357,8 @@ aide_generator = { git = "[email protected]:crowdhailer/aide.git", ref = "f559c5bc"
 "#;
     let error = deserialise_config("gleam.toml", toml.into())
         .expect_err("should fail to deserialise because of additional path");
-    assert_eq!(
-        error.to_string(),
-        r#"Parse "gleam.toml" failed: Some("data did not match any variant of untagged enum Requirement for key `dependencies.aide_generator` at line 6 column 18")"#
-    );
+
+    insta::assert_snapshot!(insta::internals::AutoName, error.pretty_string());
 }
 
 #[test]
@@ -1032,24 +1046,40 @@ mod package_name {
     use ecow::EcoString;
     use regex::Regex;
     use serde::Deserializer;
-    use std::sync::OnceLock;
+    use std::{fmt, sync::OnceLock};
 
     static PACKAGE_NAME_PATTERN: OnceLock<Regex> = OnceLock::new();
 
     pub fn deserialize<'de, D>(deserializer: D) -> Result<EcoString, D::Error>
     where
         D: Deserializer<'de>,
     {
-        let name: &str = serde::de::Deserialize::deserialize(deserializer)?;
-        if PACKAGE_NAME_PATTERN
-            .get_or_init(|| Regex::new("^[a-z][a-z0-9_]*$").expect("Package name regex"))
-            .is_match(name)
+        deserializer.deserialize_str(NameVisitor)
+    }
+
+    struct NameVisitor;
+
+    impl<'de> serde::de::Visitor<'de> for NameVisitor {
+        type Value = EcoString;
+
+        fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
+            formatter.write_str("a package name")
+        }
+
+        fn visit_str<E>(self, value: &str) -> Result<Self::Value, E>
+        where
+            E: serde::de::Error,
         {
-            Ok(name.into())
-        } else {
-            let error =
-                "Package names may only contain lowercase letters, numbers, and underscores";
-            Err(serde::de::Error::custom(error))
+            if PACKAGE_NAME_PATTERN
+                .get_or_init(|| Regex::new("^[a-z][a-z0-9_]*$").expect("Package name regex"))
+                .is_match(value)
+            {
+                Ok(value.into())
+            } else {
+                let error =
+                    "Package names may only contain lowercase letters, numbers, and underscores";
+                Err(serde::de::Error::custom(error))
+            }
         }
     }
 }
@@ -1059,24 +1089,25 @@ fn name_with_dash() {
     let input = r#"
 name = "one-two"
 "#;
-    assert_eq!(
+
+    insta::assert_snapshot!(
+        insta::internals::AutoName,
         toml::from_str::<PackageConfig>(input)
             .unwrap_err()
-            .to_string(),
-        "Package names may only contain lowercase letters, numbers, and underscores for key `name` at line 1 column 1"
-    )
+            .to_string()
+    );
 }
 
 #[test]
 fn name_with_number_start() {
     let input = r#"
 name = "1"
 "#;
-    assert_eq!(
+    insta::assert_snapshot!(
+        insta::internals::AutoName,
         toml::from_str::<PackageConfig>(input)
             .unwrap_err()
             .to_string(),
-        "Package names may only contain lowercase letters, numbers, and underscores for key `name` at line 1 column 1"
     )
 }
 

compiler-core/src/config.rs

@@ -1,4 +1,5 @@
 use std::collections::HashMap;
+use std::fmt;
 
 use crate::Result;
 use crate::io::{make_relative, ordered_map};
@@ -138,8 +139,24 @@ impl<'de> serde::Deserialize<'de> for Base16Checksum {
     where
         D: serde::Deserializer<'de>,
     {
-        let s: &str = serde::de::Deserialize::deserialize(deserializer)?;
-        base16::decode(s)
+        deserializer.deserialize_str(Base16ChecksumVisitor)
+    }
+}
+
+struct Base16ChecksumVisitor;
+
+impl<'de> serde::de::Visitor<'de> for Base16ChecksumVisitor {
+    type Value = Base16Checksum;
+
+    fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
+        formatter.write_str("a base 16 checksum")
+    }
+
+    fn visit_str<E>(self, value: &str) -> Result<Self::Value, E>
+    where
+        E: serde::de::Error,
+    {
+        base16::decode(value)
             .map(Base16Checksum)
             .map_err(serde::de::Error::custom)
     }

compiler-core/src/manifest.rs

@@ -0,0 +1,17 @@
+---
+source: compiler-core/src/config.rs
+expression: error.pretty_string()
+---
+error: File IO failure
+
+An error occurred while trying to parse this file:
+
+    gleam.toml
+
+The error message from the file IO library was:
+
+    TOML parse error at line 6, column 18
+  |
+6 | aide_generator = { git = "[email protected]:crowdhailer/aide.git", ref = "f559c5bc", extra = "idk what this is" }
+  |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+data did not match any variant of untagged enum Requirement

compiler-core/src/snapshots/gleam_core__config__deny_extra_deps_properties.snap

@@ -0,0 +1,9 @@
+---
+source: compiler-core/src/config.rs
+expression: "toml::from_str::<PackageConfig>(input).unwrap_err().to_string()"
+---
+TOML parse error at line 2, column 8
+  |
+2 | name = "one-two"
+  |        ^^^^^^^^^
+Package names may only contain lowercase letters, numbers, and underscores

compiler-core/src/snapshots/gleam_core__config__name_with_dash.snap

@@ -0,0 +1,9 @@
+---
+source: compiler-core/src/config.rs
+expression: "toml::from_str::<PackageConfig>(input).unwrap_err().to_string()"
+---
+TOML parse error at line 2, column 8
+  |
+2 | name = "1"
+  |        ^^^
+Package names may only contain lowercase letters, numbers, and underscores

compiler-core/src/snapshots/gleam_core__config__name_with_number_start.snap

@@ -2,4 +2,8 @@
 source: compiler-core/src/requirement.rs
 expression: error.to_string()
 ---
->= 2.0 and < 3.0.0 is not a valid version. missing patch version: 2.0 for key `short` at line 2 column 21
+TOML parse error at line 2, column 21
+  |
+2 |             short = ">= 2.0 and < 3.0.0"
+  |                     ^^^^^^^^^^^^^^^^^^^^
+>= 2.0 and < 3.0.0 is not a valid version. missing patch version: 2.0