Merge pull request #10365 from LawnGnome/undo-resolver-3-patch

deps: update to `cargo-manifest` 0.18.0 for real
rust-lang · Jan 10, 2025 · 66cd851 · 66cd851
2 parents 236d90a + b0453b8
commit 66cd851
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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.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
@@ -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.18.0"
 flate2 = { version = "=1.0.35", optional = true }
 serde = { version = "=1.0.217", features = ["derive"] }
 serde_json = "=1.0.135"