diff --git a/Cargo.lock b/Cargo.lock index 28f553d..d6781bd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2694,9 +2694,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.9" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3" +checksum = "40734c41988f7306bb04f0ecf60ec0f3f1caa34290e4e8ea471dcd3346483b83" dependencies = [ "serde", ] @@ -3042,35 +3042,32 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.23" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362" +checksum = "f271e09bde39ab52250160a67e88577e0559ad77e9085de6e9051a2c4353f8f8" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_parser", + "winnow", ] [[package]] name = "toml_datetime" -version = "0.6.11" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c" +checksum = "bade1c3e902f58d73d3f294cd7f20391c1cb2fbcb643b73566bc773971df91e3" dependencies = [ "serde", ] [[package]] -name = "toml_edit" -version = "0.22.27" +name = "toml_parser" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" +checksum = "b5c1c469eda89749d2230d8156a5969a69ffe0d6d01200581cdc6110674d293e" dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", "winnow", ] @@ -3706,9 +3703,6 @@ name = "winnow" version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74c7b26e3480b707944fc872477815d29a8e429d2f93a1ce000f5fa84a15cbcd" -dependencies = [ - "memchr", -] [[package]] name = "wit-bindgen-rt" diff --git a/rpxy-bin/Cargo.toml b/rpxy-bin/Cargo.toml index 59a92bd..ab2d2b1 100644 --- a/rpxy-bin/Cargo.toml +++ b/rpxy-bin/Cargo.toml @@ -59,7 +59,10 @@ futures-util = { version = "0.3.31", default-features = false } # config clap = { version = "4.5.40", features = ["std", "cargo", "wrap_help"] } -toml = { version = "0.8.23", default-features = false, features = ["parse"] } +toml = { version = "0.9.0", default-features = false, features = [ + "parse", + "serde", +] } hot_reload = "0.2.0" serde_ignored = "0.1.12" diff --git a/rpxy-bin/src/config/toml.rs b/rpxy-bin/src/config/toml.rs index 09c4353..2a7aff6 100644 --- a/rpxy-bin/src/config/toml.rs +++ b/rpxy-bin/src/config/toml.rs @@ -311,7 +311,7 @@ impl ConfigToml { let config_str = fs::read_to_string(config_file)?; // Check unused fields during deserialization - let t = toml::de::Deserializer::new(&config_str); + let t = toml::Deserializer::parse(&config_str)?; let mut unused = ahash::HashSet::default(); let res = serde_ignored::deserialize(t, |path| {