aboutsummaryrefslogtreecommitdiff
path: root/helix-loader/src/config.rs
diff options
context:
space:
mode:
authorBlaž Hrastnik2022-04-20 08:09:03 +0000
committerBlaž Hrastnik2022-04-20 08:09:03 +0000
commit35d2693630a4ec29a654704bc4be47badb8d6070 (patch)
tree4b2778af14aae46fe5553f7a063a0253177353d9 /helix-loader/src/config.rs
parent1525e3c6c846fc3dc4d4a68768105762f5abb376 (diff)
Revert "override nested arrays when merging TOML (#2145)"
Looks like there's some follow-up issues This reverts commit c8cfd0b1a0da071618a9efc71ac5735d6147a0ca.
Diffstat (limited to 'helix-loader/src/config.rs')
-rw-r--r--helix-loader/src/config.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/helix-loader/src/config.rs b/helix-loader/src/config.rs
index 242af197..5dc2d6b6 100644
--- a/helix-loader/src/config.rs
+++ b/helix-loader/src/config.rs
@@ -19,7 +19,7 @@ pub fn user_lang_config() -> Result<toml::Value, toml::de::Error> {
.into_iter()
.chain([default_lang_config()].into_iter())
.fold(toml::Value::Table(toml::value::Table::default()), |a, b| {
- crate::merge_toml_values(b, a, false)
+ crate::merge_toml_values(b, a)
});
Ok(config)