Switch to serde_yaml_ng crate from serde_yml.

Author: imunproductive

Cargo.toml

@@ -137,7 +137,7 @@ serde = { version = "1", default-features = false, features = [
     "derive",
 ] }
 serde_json = { version = "1", default-features = false, features = ["alloc"] }
-serde_yml = { version = "0.0.12", default-features = false }
+serde_yaml_ng = { version = "0.10.0", default-features = false }
 sha2 = { version = "0.10", default-features = false }
 slab = { version = "0.4.10", default-features = false }
 stability = { version = "0.2", default-features = false }

lib/asimov-flow/Cargo.toml

@@ -23,7 +23,7 @@ std = ["asimov-core/std", "protoflow/std"]
 tokio = ["protoflow/tokio"]
 tracing = ["protoflow/tracing", "protoflow-blocks/tracing"]
 unstable = ["asimov-core/unstable"]
-yaml = ["serde", "dep:serde_yml"]
+yaml = ["serde", "dep:serde_yaml_ng"]
 
 [dependencies]
 asimov-core.workspace = true
@@ -32,4 +32,4 @@ protoflow-blocks.workspace = true
 
 # Optional dependencies:
 serde = { workspace = true, optional = true }
-serde_yml = { workspace = true, optional = true }
+serde_yaml_ng = { workspace = true, optional = true }

lib/asimov-flow/src/yaml.rs

@@ -22,7 +22,7 @@ impl MaybeLabeled for YamlFlowDefinition {}
 impl FlowDefinition for YamlFlowDefinition {}
 
 impl FromStr for YamlFlowDefinition {
-    type Err = serde_yml::Error;
+    type Err = serde_yaml_ng::Error;
 
     fn from_str(input: &str) -> Result<Self, Self::Err> {
         // TODO: consider using the `yaml-rust2` crate instead

lib/asimov-installer/Cargo.toml

@@ -39,7 +39,7 @@ unstable = []
 json = ["dep:serde_json"]
 serde = ["json", "yaml"]
 tracing = ["dep:tracing", "dep:tracing-subscriber", "clientele?/tracing"]
-yaml = ["dep:serde_yml"]
+yaml = ["dep:serde_yaml_ng"]
 
 [dependencies]
 asimov-module.workspace = true
@@ -62,7 +62,7 @@ asimov-env = { workspace = true, optional = true }
 clientele = { workspace = true, optional = true }
 getenv = { workspace = true, optional = true }
 serde_json = { workspace = true, optional = true }
-serde_yml = { workspace = true, optional = true }
+serde_yaml_ng = { workspace = true, optional = true }
 tracing = { workspace = true, optional = true }
 tracing-subscriber = { workspace = true, optional = true }
 url = { workspace = true, optional = true }

lib/asimov-installer/src/installer.rs

@@ -565,7 +565,7 @@ async fn read_manifest(
                 .await
                 .map_err(ReadManifestError::InstalledManifestIo)?;
 
-            serde_yml::from_slice::<'_, InstalledModuleManifest>(&content)?
+            serde_yaml_ng::from_slice::<'_, InstalledModuleManifest>(&content)?
         },
         Some("json") => {
             let content = tokio::fs::read(&path)

lib/asimov-installer/src/installer/error.rs

@@ -147,8 +147,8 @@ mod common {
         }
     }
 
-    impl From<serde_yml::Error> for ReadManifestError {
-        fn from(value: serde_yml::Error) -> Self {
+    impl From<serde_yaml_ng::Error> for ReadManifestError {
+        fn from(value: serde_yaml_ng::Error) -> Self {
             ReadManifestError::ManifestDeserialize(DeserializeError::Yaml(value))
         }
     }
@@ -158,7 +158,7 @@ mod common {
         #[error("JSON deserialization failed: {0}")]
         Json(#[from] serde_json::Error),
         #[error("YAML deserialization failed: {0}")]
-        Yaml(#[from] serde_yml::Error),
+        Yaml(#[from] serde_yaml_ng::Error),
     }
 
     #[derive(Debug, Error)]

lib/asimov-installer/src/installer/github.rs

@@ -84,7 +84,7 @@ pub async fn fetch_module_manifest(
 
     let content = response.bytes().await?;
 
-    serde_yml::from_slice(&content).map_err(|e| FetchError::Deserialize(e.into()))
+    serde_yaml_ng::from_slice(&content).map_err(|e| FetchError::Deserialize(e.into()))
 }
 
 pub async fn fetch_checksum(

lib/asimov-module/Cargo.toml

@@ -39,7 +39,7 @@ unstable = []
 json = ["dep:serde_json"]
 serde = ["dep:serde", "json", "yaml"]
 tracing = ["dep:tracing", "dep:tracing-subscriber", "clientele?/tracing"]
-yaml = ["dep:serde_yml"]
+yaml = ["dep:serde_yaml_ng"]
 
 [dependencies]
 dogma.workspace = true
@@ -54,6 +54,6 @@ clientele = { workspace = true, optional = true }
 getenv = { workspace = true, optional = true }
 serde = { workspace = true, optional = true }
 serde_json = { workspace = true, optional = true }
-serde_yml = { workspace = true, optional = true }
+serde_yaml_ng = { workspace = true, optional = true }
 tracing = { workspace = true, optional = true }
 tracing-subscriber = { workspace = true, optional = true }

lib/asimov-module/examples/config.rs

@@ -25,7 +25,7 @@ config:
 "#;
 
 fn main() -> Result<(), Box<dyn Error>> {
-    let manifest: ModuleManifest = serde_yml::from_str(YAML)?;
+    let manifest: ModuleManifest = serde_yaml_ng::from_str(YAML)?;
 
     let api_key = manifest.variable("api_key", None).unwrap_or_default();
     if api_key.is_empty() {

lib/asimov-module/examples/decode_manifest.rs

@@ -4,9 +4,9 @@ use asimov_module::ModuleManifest;
 use std::error::Error;
 
 fn main() -> Result<(), Box<dyn Error>> {
-    let manifest = serde_yml::from_reader::<_, ModuleManifest>(std::io::stdin())?;
+    let manifest = serde_yaml_ng::from_reader::<_, ModuleManifest>(std::io::stdin())?;
     print!("Debug print:\n\n{manifest:?}\n\n");
     print!("Re-encoded:\n\n");
-    serde_yml::to_writer(std::io::stdout(), &manifest)?;
+    serde_yaml_ng::to_writer(std::io::stdout(), &manifest)?;
     Ok(())
 }