diff --git a/Cargo.lock b/Cargo.lock index a69e3e3f86..850ac7290d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2880,7 +2880,6 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "serde_yaml", "shlex", "similar-asserts", "system-deps", @@ -2891,6 +2890,7 @@ dependencies = [ "tracing", "tracing-subscriber", "xmlrpc", + "yaml_serde", ] [[package]] @@ -3116,19 +3116,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_yaml" -version = "0.9.34+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" -dependencies = [ - "indexmap", - "itoa", - "ryu", - "serde", - "unsafe-libyaml", -] - [[package]] name = "sha2" version = "0.10.9" @@ -4345,6 +4332,19 @@ version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdd20c5420375476fbd4394763288da7eb0cc0b8c11deed431a91562af7335d3" +[[package]] +name = "yaml_serde" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a7f5270edc6fab0529a772a772b3e505dfd883a8de5cc5b464e35fabe586411" +dependencies = [ + "indexmap", + "itoa", + "ryu", + "serde", + "unsafe-libyaml", +] + [[package]] name = "yoke" version = "0.8.0" diff --git a/Cargo.toml b/Cargo.toml index 40d6e311e7..32106c9c35 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -86,7 +86,7 @@ rust-ini = "0.21.2" serde = { version = "1.0.219", features = ["derive"] } serde_derive = "1.0.118" serde_json = "1.0.140" -serde_yaml = "0.9.34" +yaml_serde = "0.10.3" systemd = "0.10.0" tempfile = "3.20.0" tracing = "0.1" diff --git a/rust/src/extensions.rs b/rust/src/extensions.rs index 7de0d2084e..ee9431f93d 100644 --- a/rust/src/extensions.rs +++ b/rust/src/extensions.rs @@ -59,7 +59,7 @@ fn extensions_load_stream( basearch: &str, base_pkgs: &[StringMapping], ) -> Result> { - let mut parsed: Extensions = serde_yaml::from_reader(stream)?; + let mut parsed: Extensions = yaml_serde::from_reader(stream)?; parsed.extensions.retain(|_, ext| { ext.architectures diff --git a/rust/src/utils.rs b/rust/src/utils.rs index cb19dd3d8c..cc9ef31ef4 100644 --- a/rust/src/utils.rs +++ b/rust/src/utils.rs @@ -60,8 +60,8 @@ where pf } InputFormat::YAML => { - let pf: T = serde_yaml::from_reader(input).map_err(|e| { - io::Error::new(io::ErrorKind::InvalidInput, format!("serde-yaml: {e}")) + let pf: T = yaml_serde::from_reader(input).map_err(|e| { + io::Error::new(io::ErrorKind::InvalidInput, format!("yaml-serde: {e}")) })?; pf }