Merge branch 'mehcode:master' into master

Author: up9cloud

.github/workflows/external-types.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Install toolchain
         uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: nightly-2023-10-10
+          toolchain: nightly-2024-02-07
 
       - name: Install cargo-check-external-types
         run: cargo install --locked cargo-check-external-types

Cargo.lock

@@ -17,7 +17,7 @@ maintenance = { status = "actively-developed" }
 [features]
 default = ["toml", "json", "yaml", "ini", "ron", "json5", "jsonc", "convert-case", "async"]
 json = ["serde_json"]
-yaml = ["yaml-rust"]
+yaml = ["yaml-rust2"]
 ini = ["rust-ini"]
 json5 = ["json5_rs", "serde/derive"]
 jsonc = ["jsonc-parser"]
@@ -33,7 +33,7 @@ nom = "7"
 async-trait = { version = "0.1", optional = true }
 toml = { version = "0.8", optional = true }
 serde_json = { version = "1.0", optional = true }
-yaml-rust = { version = "0.4", optional = true }
+yaml-rust2 = { version = "0.8", optional = true }
 rust-ini = { version = "0.20", optional = true }
 ron = { version = "0.8", optional = true }
 json5_rs = { version = "0.4", optional = true, package = "json5" }

Cargo.toml

@@ -18,7 +18,7 @@
 
 [JSON]: https://github.com/serde-rs/json
 [TOML]: https://github.com/toml-lang/toml
-[YAML]: https://github.com/chyh1990/yaml-rust
+[YAML]: https://github.com/Ethiraric/yaml-rust2
 [INI]: https://github.com/zonyitoo/rust-ini
 [RON]: https://github.com/ron-rs/ron
 [JSON5]: https://github.com/callum-oakley/json5-rs

README.md

@@ -43,7 +43,7 @@ pub enum FileFormat {
     #[cfg(feature = "json")]
     Json,
 
-    /// YAML (parsed with yaml_rust)
+    /// YAML (parsed with yaml_rust2)
     #[cfg(feature = "yaml")]
     Yaml,
 

src/file/format/mod.rs

@@ -2,7 +2,7 @@ use std::error::Error;
 use std::fmt;
 use std::mem;
 
-use yaml_rust as yaml;
+use yaml_rust2 as yaml;
 
 use crate::format;
 use crate::map::Map;

src/file/format/yaml.rs

@@ -85,8 +85,7 @@ fn test_error_parse() {
     assert_eq!(
         res.unwrap_err().to_string(),
         format!(
-            "while parsing a block mapping, did not find expected key at \
-         line 2 column 1 in {}",
+            "simple key expect ':' at byte 21 line 3 column 1 in {}",
             path_with_extension.display()
         )
     );

tests/file_yaml.rs

@@ -85,8 +85,7 @@ fn test_error_parse() {
     assert_eq!(
         res.unwrap_err().to_string(),
         format!(
-            "while parsing a block mapping, did not find expected key at \
-         line 2 column 1 in {}",
+            "simple key expect ':' at byte 21 line 3 column 1 in {}",
             path_with_extension.display()
         )
     );

tests/legacy/file_yaml.rs

@@ -0,0 +1,35 @@
+use config::{Config, File, FileFormat};
+use serde_derive::Deserialize;
+
+#[derive(Debug, Deserialize)]
+#[serde(untagged)]
+enum A {
+    VariantA { port: u16 },
+}
+
+#[derive(Debug, Deserialize)]
+struct Settings {
+    a: A,
+}
+
+#[test]
+fn test_ron_enum() {
+    let c = Config::builder()
+        .add_source(File::from_str(
+            r#"
+            (
+                a: VariantA ( port: 5000 )
+            )
+            "#,
+            FileFormat::Ron,
+        ))
+        .build()
+        .unwrap();
+
+    // Deserialize the entire file as single struct
+    let s = c.try_deserialize::<Settings>();
+    assert!(s.is_ok(), "Not Ok(_): {}", s.unwrap_err());
+    let s = s.unwrap();
+    let A::VariantA { port } = s.a;
+    assert_eq!(port, 5000);
+}