enum example, py deps

miniconf/README.md

@@ -21,11 +21,14 @@ providers are supported.
 use serde::{Deserialize, Serialize};
 use miniconf::{Error, json, JsonPath, Traversal, Tree, TreeKey, Path, Packed, Node};
 
-#[derive(Deserialize, Serialize, Default)]
+#[derive(Deserialize, Serialize, Default, Tree)]
 enum Either {
     #[default]
     Bad,
     Good,
+    A(i32),
+    B(#[tree(depth=1)] Inner),
+    C(#[tree(depth=2)] [Inner; 2]),
 }
 
 #[derive(Deserialize, Serialize, Default, Tree)]
@@ -48,6 +51,8 @@ struct Settings {
 
     #[tree(depth=1)]
     struct_tree: Inner,
+    #[tree(depth=3)]
+    enum_tree: Either,
     #[tree(depth=1)]
     array_tree: [i32; 2],
     #[tree(depth=2)]
@@ -80,10 +85,10 @@ json::set(&mut settings, "/array_tree/0", b"7")?;
 // ... or by index and then struct field name
 json::set(&mut settings, "/array_tree2/0/a", b"11")?;
 // ... or by hierarchical index
-json::set_by_key(&mut settings, [7usize, 0, 1], b"8")?;
+json::set_by_key(&mut settings, [8usize, 0, 1], b"8")?;
 // ... or by packed index
-let (packed, node) = Settings::transcode::<Packed, _>([7usize, 1, 0]).unwrap();
-assert_eq!(packed.into_lsb().get(), 0b1_0111_1_0);
+let (packed, node) = Settings::transcode::<Packed, _>([8usize, 1, 0]).unwrap();
+assert_eq!(packed.into_lsb().get(), 0b1_1000_1_0);
 assert_eq!(node, Node::leaf(3));
 json::set_by_key(&mut settings, packed, b"9")?;
 // ... or by JSON path

miniconf/examples/common.rs

@@ -3,11 +3,14 @@ use serde::{Deserialize, Serialize};
 
 // Either/Inner/Settings are straight from README.md
 
-#[derive(Deserialize, Serialize, Default)]
+#[derive(Deserialize, Serialize, Default, Tree)]
 pub enum Either {
     #[default]
     Bad,
     Good,
+    A(i32),
+    B(#[tree(depth = 1)] Inner),
+    C(#[tree(depth = 2)] [Inner; 2]),
 }
 
 #[derive(Deserialize, Serialize, Default, Tree)]
@@ -30,6 +33,8 @@ pub struct Settings {
 
     #[tree(depth = 1)]
     struct_tree: Inner,
+    #[tree(depth = 3)]
+    enum_tree: Either,
     #[tree(depth = 1)]
     array_tree: [i32; 2],
     #[tree(depth = 2)]
@@ -47,6 +52,7 @@ impl Settings {
     /// Fill some of the Options
     pub fn enable(&mut self) {
         self.option_tree = Some(8);
+        self.enum_tree = Either::B(Default::default());
         self.option_tree2 = Some(Default::default());
         self.array_option_tree[1] = Some(Default::default());
     }

py/miniconf-mqtt/pyproject.toml

@@ -14,7 +14,7 @@ authors = [
     { name = "Ryan Summers", email = "[email protected]" },
     { name = "Robert Jördens", email = "[email protected]" },
 ]
-dependencies = ["aiomqtt >= 2.2.0", "typing_extensions >= 4.12"]
+dependencies = ["aiomqtt >= 2.1.0", "typing_extensions >= 4.11"]
 
 [project.urls]
 Homepage = "https://github.com/quartiq/miniconf"