Merge pull request #3997 from deltachat/dependabot/cargo/toml-0.7.0

Cargo.lock

@@ -946,7 +946,7 @@ dependencies = [
  "tokio-io-timeout",
  "tokio-stream",
  "tokio-tar",
- "toml",
+ "toml 0.7.0",
  "trust-dns-resolver",
  "url",
  "uuid 1.2.2",
@@ -1759,7 +1759,7 @@ dependencies = [
  "serde",
  "serde_derive",
  "termcolor",
- "toml",
+ "toml 0.5.11",
  "uuid 0.8.2",
 ]
 
@@ -2276,6 +2276,15 @@ dependencies = [
  "minimal-lexical",
 ]
 
+[[package]]
+name = "nom8"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "num-bigint-dig"
 version = "0.8.1"
@@ -3239,6 +3248,15 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_spanned"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c68e921cef53841b8925c2abadd27c9b891d9613bdc43d6b823062866df38e8"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "serde_urlencoded"
 version = "0.7.1"
@@ -3670,13 +3688,47 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.5.10"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f"
+checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
 dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "toml"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f560bc7fb3eb31f5eee1340c68a2160cad39605b7b9c9ec32045ddbdee13b85"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "886f31a9b85b6182cabd4d8b07df3b451afcc216563748201490940d2a28ed36"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "233d8716cdc5d20ec88a18a839edaf545edc71efa4a5ff700ef4a102c26cd8fa"
+dependencies = [
+ "indexmap",
+ "nom8",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+]
+
 [[package]]
 name = "tower"
 version = "0.4.13"

Cargo.toml

@@ -77,7 +77,7 @@ smallvec = "1"
 strum = "0.24"
 strum_macros = "0.24"
 thiserror = "1"
-toml = "0.5"
+toml = "0.7"
 url = "2"
 uuid = { version = "1", features = ["serde", "v4"] }
 fast-socks5 = "0.8"

src/accounts.rs

@@ -363,7 +363,8 @@ impl Config {
     pub async fn from_file(file: PathBuf) -> Result<Self> {
         let dir = file.parent().context("can't get config file directory")?;
         let bytes = fs::read(&file).await.context("failed to read file")?;
-        let mut inner: InnerConfig = toml::from_slice(&bytes).context("failed to parse config")?;
+        let s = std::str::from_utf8(&bytes)?;
+        let mut inner: InnerConfig = toml::from_str(s).context("failed to parse config")?;
 
         // Previous versions of the core stored absolute paths in account config.
         // Convert them to relative paths.

src/webxdc.rs

@@ -640,7 +640,8 @@ impl Context {
 }
 
 fn parse_webxdc_manifest(bytes: &[u8]) -> Result<WebxdcManifest> {
-    let manifest: WebxdcManifest = toml::from_slice(bytes)?;
+    let s = std::str::from_utf8(bytes)?;
+    let manifest: WebxdcManifest = toml::from_str(s)?;
     Ok(manifest)
 }