deps: switch to serde_yaml_bw

serde_yml (which we used before) and serde_yaml are both
unmaintained now, and serde_yml was using a yaml parser that's
itself unsupported and unmaintained. Thankfully, looks like
serde_yaml_bw is a drop-in replacement.

Author: mistydemeo

Cargo.lock

@@ -15,8 +15,8 @@ toml-serde = ["toml", "serde"]
 json-serde = ["serde_json", "serde"]
 # Enable SourceFile support for deserializing using the "toml_edit" crate
 toml-edit = ["toml_edit"]
-# Enable SourceFile support for deserializing using the "serde_yml" crate
-yaml-serde = ["serde_yml", "serde"]
+# Enable SourceFile support for deserializing using the "serde_yaml_bw" crate
+yaml-serde = ["serde_yaml_bw", "serde"]
 # Enable reqwest-based http file fetching
 remote = ["reqwest", "image"]
 # On the off-chance native tls roots cause a problem, they can be opted out of
@@ -39,7 +39,7 @@ miette = "7.0.0"
 camino = "1.1.9"
 toml = { version = "0.9.0", optional = true }
 serde_json = { version = "1.0.132", optional = true }
-serde_yml = { version = "0.0.11", optional = true }
+serde_yaml_bw = { version = "2.2.0", optional = true }
 serde = { version = "1.0.214", optional = true, features = ["derive"] }
 tar = { version = "0.4.42", optional = true }
 zip = { version = "4.5.0", optional = true, default-features = false, features = ["aes-crypto", "bzip2", "deflate", "time", "zstd"] }

Cargo.toml

@@ -345,6 +345,6 @@ pub enum AxoassetError {
         span: Option<miette::SourceSpan>,
         /// Details of the error
         #[source]
-        details: serde_yml::Error,
+        details: serde_yaml_bw::Error,
     },
 }

src/error.rs

@@ -30,7 +30,7 @@ pub use reqwest;
 #[cfg(feature = "json-serde")]
 pub use serde_json;
 #[cfg(feature = "yaml-serde")]
-pub use serde_yml;
+pub use serde_yaml_bw;
 pub use source::SourceFile;
 pub use spanned::Spanned;
 #[cfg(feature = "toml-serde")]

src/lib.rs

@@ -15,7 +15,7 @@ use crate::toml_edit::DocumentMut;
 use crate::serde_json;
 
 #[cfg(feature = "yaml-serde")]
-use crate::serde_yml;
+use crate::serde_yaml_bw;
 
 /// The inner contents of a [`SourceFile`][].
 #[derive(Eq, PartialEq)]
@@ -134,7 +134,7 @@ impl SourceFile {
     /// Try to deserialize the contents of the SourceFile as yaml
     #[cfg(feature = "yaml-serde")]
     pub fn deserialize_yaml<'a, T: for<'de> serde::Deserialize<'de>>(&self) -> Result<T> {
-        let yaml = serde_yml::from_str(self.contents()).map_err(|details| {
+        let yaml = serde_yaml_bw::from_str(self.contents()).map_err(|details| {
             let span = details
                 .location()
                 .and_then(|location| self.span_for_line_col(location.line(), location.column()));

src/source.rs

@@ -225,8 +225,6 @@ goodbye: true
 #[test]
 #[cfg(feature = "yaml-serde")]
 fn yaml_invalid() {
-    use axoasset::AxoassetError;
-
     #[derive(serde::Deserialize, PartialEq, Eq, Debug)]
     struct MyType {
         hello: String,
@@ -243,8 +241,9 @@ goodbye: "this shouldn't be a string"
     let source = axoasset::SourceFile::new("file.yml", contents);
 
     let res = source.deserialize_yaml::<MyType>();
+    // In a previous version, we had an assertion that the span
+    // was filled out here. Unfortunately, the span isn't always
+    // available in the yaml library we had to switch to;
+    // investigate other options in the future.
     assert!(res.is_err());
-    let Err(AxoassetError::Yaml { span: Some(_), .. }) = res else {
-        panic!("span was invalid");
-    };
 }