From 1fc69efffeb8140038829fdef932dcc3485bdd1f Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Sat, 31 Jan 2026 09:14:22 +0000
Subject: [PATCH] Simplify Figment init, toml config file folding.

Signed-off-by: Jason Volk <jason@zemos.net>
---
 src/core/config/mod.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/core/config/mod.rs b/src/core/config/mod.rs
index 92cde29c..6e0ca178 100644
--- a/src/core/config/mod.rs
+++ b/src/core/config/mod.rs
@@ -13,7 +13,7 @@ use either::{
 	Either,
 	Either::{Left, Right},
 };
-use figment::providers::{Env, Format, Toml};
+use figment::providers::{Data, Env, Format, Toml};
 pub use figment::{Figment, value::Value as FigmentValue};
 use itertools::Itertools;
 use regex::RegexSet;
@@ -2951,7 +2951,8 @@ impl Config {
 		let config = toml_files
 			.iter()
 			.map(Toml::file)
-			.fold(Figment::new(), |config, file| config.merge(file.nested()))
+			.map(Data::nested)
+			.fold(Figment::new(), Figment::merge)
 			.merge(Env::prefixed("CONDUIT_").global().split("__"))
 			.merge(Env::prefixed("CONDUWUIT_").global().split("__"))
 			.merge(Env::prefixed("TUWUNEL_").global().split("__"));