Skip to content

Commit d90dd14

Browse files
committed
Merge PR #58: Add serde_norway as that seems more maintained
2 parents d48b760 + ec6aa55 commit d90dd14

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ default = ["indexmap", "yaml"]
1818
indexmap = ["dep:indexmap"]
1919
yml = ["dep:serde_yml"]
2020
yaml = ["dep:serde_yaml"]
21+
norway = ["dep:serde_norway"]
2122

2223

2324
[dependencies]
@@ -26,6 +27,7 @@ indexmap = { version = "2.2", features = ["serde"], optional = true }
2627
serde = { version = "1.0", features = ["derive"] }
2728
serde_yaml = { version = "=0.9.33", optional = true }
2829
serde_yml = { version = "0.0.12", optional = true }
30+
serde_norway = { version = "0.9.42", optional = true }
2931

3032
[dev-dependencies]
3133
glob = "0.3"

src/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@ use derive_builder::*;
22
#[cfg(feature = "indexmap")]
33
use indexmap::IndexMap;
44
use serde::{Deserialize, Deserializer, Serialize};
5+
#[cfg(feature = "norway")]
6+
use serde_norway as serde_yaml;
57
#[cfg(feature = "yml")]
68
use serde_yml as serde_yaml;
9+
710
#[cfg(not(feature = "indexmap"))]
811
use std::collections::HashMap;
912
use std::convert::TryFrom;

tests/mod.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
#[cfg(all(feature = "norway", not(feature = "yaml"), not(feature = "yml")))]
2+
use serde_norway::from_str;
13
#[cfg(feature = "yaml")]
24
use serde_yaml::from_str;
3-
#[cfg(all(feature = "yml", not(feature = "yaml")))]
5+
#[cfg(all(feature = "yml", not(feature = "yaml"), not(feature = "norway")))]
46
use serde_yml::from_str;
57

68
#[test]

0 commit comments

Comments
 (0)