From 8479e38891329ce8c2e6e400838be8e7b523c8af Mon Sep 17 00:00:00 2001
From: Adam Harvey <adam@adamharvey.name>
Date: Thu, 9 Jan 2025 17:45:06 -0800
Subject: [PATCH 1/2] Revert "deps: patch `cargo-manifest` to support resolver
 3"

This reverts commit cf8604c13b6323263b46e2e3560aaa65eb8370d7.
---
 Cargo.lock                          | 3 ++-
 Cargo.toml                          | 5 +----
 crates/crates_io_tarball/Cargo.toml | 5 +----
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 40612c9d5b5..fa31bfdba3b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -768,7 +768,8 @@ dependencies = [
 [[package]]
 name = "cargo-manifest"
 version = "0.17.0"
-source = "git+https://github.com/LawnGnome/cargo-manifest?rev=5c256c6c3c2507438c501ecfa5c39b4ab5ccf5a9#5c256c6c3c2507438c501ecfa5c39b4ab5ccf5a9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b2ce2075c35e4b492b93e3d5dd1dd3670de553f15045595daef8164ed9a3751"
 dependencies = [
  "serde",
  "thiserror 1.0.69",
diff --git a/Cargo.toml b/Cargo.toml
index f0a55828f7b..f789fdbbde4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -53,10 +53,7 @@ axum-extra = { version = "=0.10.0", features = ["erased-json", "query", "typed-h
 base64 = "=0.22.1"
 bigdecimal = { version = "=0.4.7", features = ["serde"] }
 bon = "=3.3.2"
-# Temporarily use cargo-manifest 0.17.0 + the commit to fix
-# https://github.com/LukeMathWalker/cargo-manifest/issues/63 cherry picked on
-# top to unblock resolver v3 support.
-cargo-manifest = { git = "https://github.com/LawnGnome/cargo-manifest", rev = "5c256c6c3c2507438c501ecfa5c39b4ab5ccf5a9" }
+cargo-manifest = "=0.17.0"
 colored = "=3.0.0"
 crates_io_cdn_logs = { path = "crates/crates_io_cdn_logs" }
 crates_io_database = { path = "crates/crates_io_database" }
diff --git a/crates/crates_io_tarball/Cargo.toml b/crates/crates_io_tarball/Cargo.toml
index d23fca12722..b7691eb4f55 100644
--- a/crates/crates_io_tarball/Cargo.toml
+++ b/crates/crates_io_tarball/Cargo.toml
@@ -11,10 +11,7 @@ workspace = true
 builder = ["dep:flate2", "dep:tar"]
 
 [dependencies]
-# Temporarily use cargo-manifest 0.17.0 + the commit to fix
-# https://github.com/LukeMathWalker/cargo-manifest/issues/63 cherry picked on
-# top to unblock resolver v3 support.
-cargo-manifest = { git = "https://github.com/LawnGnome/cargo-manifest", rev = "5c256c6c3c2507438c501ecfa5c39b4ab5ccf5a9" }
+cargo-manifest = "=0.17.0"
 flate2 = { version = "=1.0.35", optional = true }
 serde = { version = "=1.0.217", features = ["derive"] }
 serde_json = "=1.0.135"

From b0453b8545bb229ed9ae78fe23901fec6bdb9ba6 Mon Sep 17 00:00:00 2001
From: Adam Harvey <adam@adamharvey.name>
Date: Thu, 9 Jan 2025 17:47:41 -0800
Subject: [PATCH 2/2] deps: upgrade `cargo-manifest` to 0.18.0

This includes the fix for
https://github.com/LukeMathWalker/cargo-manifest/issues/63 that
necessitated the earlier change to pin to a specific commit in my fork
of `cargo-manifest`.
---
 Cargo.lock                          | 6 +++---
 Cargo.toml                          | 2 +-
 crates/crates_io_tarball/Cargo.toml | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fa31bfdba3b..100e2c606bb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -767,12 +767,12 @@ dependencies = [
 
 [[package]]
 name = "cargo-manifest"
-version = "0.17.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b2ce2075c35e4b492b93e3d5dd1dd3670de553f15045595daef8164ed9a3751"
+checksum = "2e7713fa8974fe547c44fcf043d0d910fff5fd95673d40b77a769495657789fb"
 dependencies = [
  "serde",
- "thiserror 1.0.69",
+ "thiserror 2.0.10",
  "toml",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index f789fdbbde4..42dcc5730dc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -53,7 +53,7 @@ axum-extra = { version = "=0.10.0", features = ["erased-json", "query", "typed-h
 base64 = "=0.22.1"
 bigdecimal = { version = "=0.4.7", features = ["serde"] }
 bon = "=3.3.2"
-cargo-manifest = "=0.17.0"
+cargo-manifest = "=0.18.0"
 colored = "=3.0.0"
 crates_io_cdn_logs = { path = "crates/crates_io_cdn_logs" }
 crates_io_database = { path = "crates/crates_io_database" }
diff --git a/crates/crates_io_tarball/Cargo.toml b/crates/crates_io_tarball/Cargo.toml
index b7691eb4f55..124d4662fb7 100644
--- a/crates/crates_io_tarball/Cargo.toml
+++ b/crates/crates_io_tarball/Cargo.toml
@@ -11,7 +11,7 @@ workspace = true
 builder = ["dep:flate2", "dep:tar"]
 
 [dependencies]
-cargo-manifest = "=0.17.0"
+cargo-manifest = "=0.18.0"
 flate2 = { version = "=1.0.35", optional = true }
 serde = { version = "=1.0.217", features = ["derive"] }
 serde_json = "=1.0.135"