From 1d0e48cb38d6d11903e0b8576b5c7238d4f8f853 Mon Sep 17 00:00:00 2001 From: Erlend Hamnaberg Date: Thu, 17 Jul 2025 14:11:25 +0200 Subject: [PATCH 1/2] Add serde_norway as that seems more maintained serde-yaml is unmaintained and serde-yml seems like it has some problems. --- Cargo.toml | 6 ++++-- src/lib.rs | 3 +++ tests/mod.rs | 4 +++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 5c13f5f..a12b7dc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,14 +18,16 @@ default = ["indexmap", "yaml"] indexmap = ["dep:indexmap"] yml = ["dep:serde_yml"] yaml = ["dep:serde_yaml"] +norway = ["dep:serde_norway"] [dependencies] -derive_builder = "0.20.0" -indexmap = { version = "2.2", features = ["serde"], optional = true } +derive_builder = "0.20.2" +indexmap = { version = "2.10.0", features = ["serde"], optional = true } serde = { version = "1.0", features = ["derive"] } serde_yaml = { version = "=0.9.33", optional = true } serde_yml = { version = "0.0.12", optional = true } +serde_norway = { version = "0.9.42", optional = true } [dev-dependencies] glob = "0.3" diff --git a/src/lib.rs b/src/lib.rs index 81e2518..80c6465 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -2,8 +2,11 @@ use derive_builder::*; #[cfg(feature = "indexmap")] use indexmap::IndexMap; use serde::{Deserialize, Deserializer, Serialize}; +#[cfg(feature = "norway")] +use serde_norway as serde_yaml; #[cfg(feature = "yml")] use serde_yml as serde_yaml; + #[cfg(not(feature = "indexmap"))] use std::collections::HashMap; use std::convert::TryFrom; diff --git a/tests/mod.rs b/tests/mod.rs index f6fc088..fc9cf35 100644 --- a/tests/mod.rs +++ b/tests/mod.rs @@ -1,6 +1,8 @@ +#[cfg(all(feature = "norway", not(feature = "yaml"), not(feature = "yml")))] +use serde_norway::from_str; #[cfg(feature = "yaml")] use serde_yaml::from_str; -#[cfg(all(feature = "yml", not(feature = "yaml")))] +#[cfg(all(feature = "yml", not(feature = "yaml"), not(feature = "norway")))] use serde_yml::from_str; #[test] From ec6aa5513835292d4578d7f4c2ccefbfc5517030 Mon Sep 17 00:00:00 2001 From: Erlend Hamnaberg Date: Thu, 17 Jul 2025 14:28:05 +0200 Subject: [PATCH 2/2] revert bumping dependencies --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index a12b7dc..b3bc489 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,8 +22,8 @@ norway = ["dep:serde_norway"] [dependencies] -derive_builder = "0.20.2" -indexmap = { version = "2.10.0", features = ["serde"], optional = true } +derive_builder = "0.20.0" +indexmap = { version = "2.2", features = ["serde"], optional = true } serde = { version = "1.0", features = ["derive"] } serde_yaml = { version = "=0.9.33", optional = true } serde_yml = { version = "0.0.12", optional = true }