From d0cc57af75bcf6ccec47eafaff407c4082a32873 Mon Sep 17 00:00:00 2001
From: Predrag Gruevski <2348618+obi1kenobi@users.noreply.github.com>
Date: Sun, 10 Mar 2024 20:59:55 -0400
Subject: [PATCH] Update cargo and toml-related dependencies. (#692)

---
 Cargo.lock         | 66 ++++++++++------------------------------------
 Cargo.toml         |  8 +++---
 src/rustdoc_cmd.rs |  2 +-
 3 files changed, 19 insertions(+), 57 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f7ca965c..74293de1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -289,7 +289,7 @@ dependencies = [
  "assert_cmd",
  "atty",
  "bugreport",
- "cargo_metadata 0.17.0",
+ "cargo_metadata",
  "cargo_toml",
  "clap",
  "clap-cargo",
@@ -313,30 +313,16 @@ dependencies = [
  "tame-index",
  "termcolor",
  "termcolor_output",
- "toml 0.7.8",
+ "toml",
  "trustfall",
  "trustfall_rustdoc",
 ]
 
 [[package]]
 name = "cargo_metadata"
-version = "0.15.4"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a"
-dependencies = [
- "camino",
- "cargo-platform",
- "semver",
- "serde",
- "serde_json",
- "thiserror",
-]
-
-[[package]]
-name = "cargo_metadata"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7daec1a2a2129eeba1644b220b4647ec537b0b5d4bfd6876fcc5a540056b592"
+checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037"
 dependencies = [
  "camino",
  "cargo-platform",
@@ -348,12 +334,12 @@ dependencies = [
 
 [[package]]
 name = "cargo_toml"
-version = "0.15.3"
+version = "0.19.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "599aa35200ffff8f04c1925aa1acc92fa2e08874379ef42e210a80e527e60838"
+checksum = "a98356df42a2eb1bd8f1793ae4ee4de48e384dd974ce5eac8eee802edb7492be"
 dependencies = [
  "serde",
- "toml 0.7.8",
+ "toml",
 ]
 
 [[package]]
@@ -380,13 +366,13 @@ dependencies = [
 
 [[package]]
 name = "clap-cargo"
-version = "0.10.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eca953650a7350560b61db95a0ab1d9c6f7b74d146a9e08fb258b834f3cf7e2c"
+checksum = "f6e2fd20c8f8c7cc395f69a86a61eb9d93e1de8fadc00338508cde2ffc656388"
 dependencies = [
- "cargo_metadata 0.15.4",
+ "anstyle",
+ "cargo_metadata",
  "clap",
- "doc-comment",
 ]
 
 [[package]]
@@ -1670,7 +1656,7 @@ dependencies = [
  "os_info",
  "serde",
  "serde_derive",
- "toml 0.8.10",
+ "toml",
  "uuid",
 ]
 
@@ -2784,18 +2770,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "toml"
-version = "0.7.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257"
-dependencies = [
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit 0.19.15",
-]
-
 [[package]]
 name = "toml"
 version = "0.8.10"
@@ -2805,7 +2779,7 @@ dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.22.6",
+ "toml_edit",
 ]
 
 [[package]]
@@ -2826,19 +2800,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "toml_edit"
-version = "0.19.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
-dependencies = [
- "indexmap",
- "serde",
- "serde_spanned",
- "toml_datetime",
- "winnow 0.5.40",
-]
-
 [[package]]
 name = "toml_edit"
 version = "0.22.6"
@@ -2849,6 +2810,7 @@ dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
+ "winnow 0.6.5",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index d8dbb6bd..35bda4f1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -26,8 +26,8 @@ handlebars = "4.3.1"
 atty = "0.2.14"
 termcolor = "1.1.3"
 termcolor_output = "1.0.1"
-cargo_metadata = "0.17.0"
-clap-cargo = { version = "0.10.0", features = ["cargo_metadata"] }
+cargo_metadata = "0.18.1"
+clap-cargo = { version = "0.14.0", features = ["cargo_metadata"] }
 ignore = "0.4.18"
 clap-verbosity-flag = "2.0.0"
 log = "0.4.17"
@@ -39,8 +39,8 @@ tame-index = { version = "0.9", features = ["git", "sparse"] }
 human-panic = "1.0.3"
 bugreport = "0.5.0"
 itertools = "0.11.0"
-cargo_toml = "0.15.2"
-toml = "0.7.6"
+cargo_toml = "0.19.2"
+toml = "0.8.10"
 directories = "5.0.1"
 sha2 = "0.10.6"
 rustc_version = "0.4.0"
diff --git a/src/rustdoc_cmd.rs b/src/rustdoc_cmd.rs
index 1101577d..3930c32d 100644
--- a/src/rustdoc_cmd.rs
+++ b/src/rustdoc_cmd.rs
@@ -408,7 +408,7 @@ fn create_placeholder_rustdoc_manifest(
             let mut deps = DepsSet::new();
             deps.insert(
                 crate_source.name()?.to_string(),
-                Dependency::Detailed(project_with_features),
+                Dependency::Detailed(Box::new(project_with_features)),
             );
             deps
         },