diff --git a/Cargo.lock b/Cargo.lock index 880b7ed84..c3e9b5b92 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4479,7 +4479,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit", + "toml_edit 0.19.15", ] [[package]] @@ -5290,6 +5290,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_spanned" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" +dependencies = [ + "serde", +] + [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -5881,11 +5890,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.11" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148" dependencies = [ "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.22.24", ] [[package]] @@ -5893,6 +5905,9 @@ name = "toml_datetime" version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +dependencies = [ + "serde", +] [[package]] name = "toml_edit" @@ -5905,6 +5920,19 @@ dependencies = [ "winnow 0.5.40", ] +[[package]] +name = "toml_edit" +version = "0.22.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474" +dependencies = [ + "indexmap 2.8.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.7.6", +] + [[package]] name = "tonic" version = "0.12.3" diff --git a/Cargo.toml b/Cargo.toml index 8ae03f69a..35e4ca673 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -277,7 +277,7 @@ tokio = "^1.44.2" tokio-openssl = "^0.6.5" tokio-util = "^0.7.13" -toml = "^0.5.11" +toml = "^0.8.20" tracing = { version = "^0.1.41", features = [ "max_level_trace", "release_max_level_debug", diff --git a/libs/profiles/src/lib.rs b/libs/profiles/src/lib.rs index a0714eff3..29b35582a 100644 --- a/libs/profiles/src/lib.rs +++ b/libs/profiles/src/lib.rs @@ -77,7 +77,10 @@ pub fn apply_profile() { .decode(contents) .unwrap_or_else(|_| panic!("Failed to parse profile - {} - {}", profile, contents)); - let profile_cfg: ProfileConfig = toml::from_slice(&data) + let data_str = String::from_utf8(data) + .unwrap_or_else(|_| panic!("Failed to read profile data to UTF-8 string - {}", profile)); + + let profile_cfg: ProfileConfig = toml::from_str(&data_str) .unwrap_or_else(|_| panic!("Failed to parse profile - {} - {}", profile, contents)); // We have to setup for our pkg version to be passed into things correctly