From 30652839773acedaef63083f0f489f8deeeda512 Mon Sep 17 00:00:00 2001
From: Niklas Mohrin <dev@niklasmohrin.de>
Date: Thu, 6 Aug 2026 00:52:55 +0200
Subject: [PATCH] Update to toml 0.9 and remove ugly parsing hack

---
 Cargo.lock    | 51 ++++++++++++++++++++++++++-------------------------
 Cargo.toml    |  2 +-
 src/config.rs |  7 +------
 3 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4fba42b..d831c75 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1057,11 +1057,11 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.9"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
+checksum = "6662b5879511e06e8999a8a235d848113e942c9124f211511b16466ee2995f26"
 dependencies = [
- "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -1178,44 +1178,42 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.23"
+version = "0.9.12+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
+checksum = "cf92845e79fc2e2def6a5d828f0801e29a2f8acc037becc5ab08595c7d5e9863"
 dependencies = [
- "serde",
+ "indexmap",
+ "serde_core",
  "serde_spanned",
  "toml_datetime",
- "toml_edit",
+ "toml_parser",
+ "toml_writer",
+ "winnow 0.7.13",
 ]
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.11"
+version = "0.7.5+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
+checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347"
 dependencies = [
- "serde",
+ "serde_core",
 ]
 
 [[package]]
-name = "toml_edit"
-version = "0.22.27"
+name = "toml_parser"
+version = "1.1.3+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
+checksum = "1d38ac1cf9b95face32296c0a3ede1fdc270627c9d9c02a7274dd6d960dc4d56"
 dependencies = [
- "indexmap",
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_write",
- "winnow",
+ "winnow 1.0.4",
 ]
 
 [[package]]
-name = "toml_write"
-version = "0.1.2"
+name = "toml_writer"
+version = "1.1.2+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
+checksum = "7d56353a2a665ad0f41a421187180aab746c8c325620617ad883a99a1cbe66d2"
 
 [[package]]
 name = "unicode-ident"
@@ -1616,9 +1614,12 @@ name = "winnow"
 version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
-dependencies = [
- "memchr",
-]
+
+[[package]]
+name = "winnow"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23b97319f7b8343df12cc98938e5c3eb436064524c8d2b4e30a1d3a36eecdf81"
 
 [[package]]
 name = "wit-bindgen"
diff --git a/Cargo.toml b/Cargo.toml
index 1d98992..5849184 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -28,7 +28,7 @@ log = "0.4"
 serde = "1.0.21"
 serde_derive = "1.0.21"
 ureq = { version = "3.0.8", default-features = false, features = ["gzip", "socks-proxy"] }
-toml = "0.8.19"
+toml = "0.9"
 yansi = "1"
 zip = { version = "5.1.1", default-features = false, features = ["deflate"] }
 
diff --git a/src/config.rs b/src/config.rs
index e057f1b..25056f4 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -807,6 +807,7 @@ impl ConfigLoader {
                 .ok_or(anyhow!("Invalid override-string: {override_str}"))?;
 
             let name = name.trim();
+            let value = toml::Value::from_str(value.trim())?;
 
             let mut keypath = name.split('.');
             let key_start = keypath
@@ -826,12 +827,6 @@ impl ConfigLoader {
                 ))?;
             }
 
-            let ugly_intermediate_key = "ugly_intermediate";
-            let value = format!("{ugly_intermediate_key} = {value}");
-            let mut value = toml::Value::from_str(&value)?;
-            let value = value.as_table_mut().unwrap();
-            let value = value.remove(ugly_intermediate_key).unwrap();
-
             *entry = value;
         }
         Ok(config_table)