Upgrade rust-config-tree to 0.2.5 with ConfigSchema derive support

- Bump rust-config-tree dependency from 0.2.3 to 0.2.5
- Switch ConfigSchema import to top-level re-export path
- Replace manual ConfigSchema impl with derive macro

Author: developerworks

Cargo.lock

@@ -37,7 +37,7 @@ name = "rust-tokio-supervisor"
 path = "src/main.rs"
 
 [dependencies]
-rust-config-tree = "0.2.3"
+rust-config-tree = "0.2.5"
 clap = { version = "4.6.1", features = ["derive"] }
 confique = { version = "0.4.0", features = ["yaml"] }
 figment = { version = "0.10.19", features = ["yaml", "toml", "json"] }

Cargo.toml

@@ -4,7 +4,7 @@
 //! YAML loading, template rendering, and JSON Schema generation.
 
 use confique::Config;
-use rust_config_tree::config::ConfigSchema;
+use rust_config_tree::ConfigSchema;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use std::path::PathBuf;
@@ -26,7 +26,7 @@ use crate::{
 };
 
 /// Configuration file shape loaded from YAML.
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Config, JsonSchema)]
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Config, JsonSchema, ConfigSchema)]
 pub struct SupervisorConfig {
     /// Additional configuration files included by `rust-config-tree`.
     #[config(default = [])]
@@ -98,20 +98,20 @@ pub struct SupervisorConfig {
     pub children: ChildrenConfigSection,
 }
 
-impl ConfigSchema for SupervisorConfig {
-    /// Returns child configuration paths declared by one loaded layer.
-    ///
-    /// # Arguments
-    ///
-    /// - `layer`: Partially loaded supervisor configuration layer.
-    ///
-    /// # Returns
-    ///
-    /// Returns include paths declared by this configuration layer.
-    fn include_paths(layer: &<Self as Config>::Layer) -> Vec<PathBuf> {
-        layer.include.clone().unwrap_or_default()
-    }
-}
+// impl ConfigSchema for SupervisorConfig {
+//     /// Returns child configuration paths declared by one loaded layer.
+//     ///
+//     /// # Arguments
+//     ///
+//     /// - `layer`: Partially loaded supervisor configuration layer.
+//     ///
+//     /// # Returns
+//     ///
+//     /// Returns include paths declared by this configuration layer.
+//     fn include_paths(layer: &<Self as Config>::Layer) -> Vec<PathBuf> {
+//         layer.include.clone().unwrap_or_default()
+//     }
+// }
 
 /// Root supervisor configuration.
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Config, JsonSchema)]