From e1e7bc77bf2744906a4476f069136833b64020f3 Mon Sep 17 00:00:00 2001
From: Matt Tanous <matthew.tanous@shopify.com>
Date: Sat, 5 Oct 2024 01:50:22 -0400
Subject: [PATCH] Switch from deprecated serde_yaml to forked serde_yml

---
 Cargo.toml            |  4 ++--
 src/providers/data.rs | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index bb86caa..0f26e77 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,7 +19,7 @@ default = ["env"]
 json = ["serde_json"]
 test = ["tempfile", "parking_lot"]
 toml = ["toml_edit"]
-yaml = ["serde_yaml"]
+yaml = ["serde_yml"]
 env = [] # does nothing; here for backwards compat
 
 [dependencies]
@@ -27,7 +27,7 @@ serde = "1.0"
 uncased = "0.9.3"
 toml_edit = { version = "0.22", optional = true, default-features = false, features = ["parse", "serde"] }
 serde_json = { version = "1.0", optional = true }
-serde_yaml = { version = "0.9", optional = true }
+serde_yml = { version = "0.0.12", optional = true }
 tempfile = { version = "3", optional = true }
 parking_lot = { version = "0.12", optional = true }
 
diff --git a/src/providers/data.rs b/src/providers/data.rs
index d135de8..0109be9 100644
--- a/src/providers/data.rs
+++ b/src/providers/data.rs
@@ -531,7 +531,7 @@ impl YamlExtended {
     /// This "YAML Extended" format parser implements the draft ["Merge Key
     /// Language-Independent Type for YAML™ Version
     /// 1.1"](https://yaml.org/type/merge.html) spec via
-    /// [`serde_yaml::Value::apply_merge()`]. This method is _not_ intended to
+    /// [`serde_yml::Value::apply_merge()`]. This method is _not_ intended to
     /// be used directly but rather indirectly by making use of `YamlExtended`
     /// as a provider. The extension is not part of any officially supported
     /// YAML release and is deprecated entirely since YAML 1.2. Using
@@ -603,14 +603,14 @@ impl YamlExtended {
     ///     Ok(())
     /// });
     /// ```
-    pub fn from_str<'de, T: DeserializeOwned>(s: &'de str) -> serde_yaml::Result<T> {
-        let mut value: serde_yaml::Value = serde_yaml::from_str(s)?;
+    pub fn from_str<'de, T: DeserializeOwned>(s: &'de str) -> serde_yml::Result<T> {
+        let mut value: serde_yml::Value = serde_yml::from_str(s)?;
         value.apply_merge()?;
         T::deserialize(value)
     }
 }
 
 impl_format!(Toml "TOML"/"toml": toml_edit::de::from_str, toml_edit::de::Error);
-impl_format!(Yaml "YAML"/"yaml": serde_yaml::from_str, serde_yaml::Error);
+impl_format!(Yaml "YAML"/"yaml": serde_yml::from_str, serde_yml::Error);
 impl_format!(Json "JSON"/"json": serde_json::from_str, serde_json::error::Error);
-impl_format!(YamlExtended "YAML Extended"/"yaml": YamlExtended::from_str, serde_yaml::Error);
+impl_format!(YamlExtended "YAML Extended"/"yaml": YamlExtended::from_str, serde_yml::Error);