From c7da6b444c1c91ac538cdeb2a7a9b5a30ff53f2c Mon Sep 17 00:00:00 2001 From: tottoto Date: Sat, 11 Apr 2026 14:23:04 +0900 Subject: [PATCH] chore: Update to cargo_metadata 0.23 --- Cargo.lock | 27 +++++++++++++++++---------- sqlx-cli/Cargo.toml | 2 +- sqlx-cli/src/metadata.rs | 5 +++-- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d8ee57652b..ca87304b8a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -709,25 +709,25 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.9" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e35af189006b9c0f00a064685c727031e3ed2d8020f7ba284d78cc2671bd36ea" +checksum = "122ec45a44b270afd1402f351b782c676b173e3c3fb28d86ff7ebfb4d86a4ee4" dependencies = [ "serde", ] [[package]] name = "cargo_metadata" -version = "0.18.1" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" +checksum = "ef987d17b0a113becdd19d3d0022d04d7ef41f9efe4f3fb63ac44ba61df3ade9" dependencies = [ "camino", "cargo-platform", "semver", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror 2.0.17", ] [[package]] @@ -1377,9 +1377,9 @@ dependencies = [ [[package]] name = "flume" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095" +checksum = "5e139bc46ca777eb5efaf62df0ab8cc5fd400866427e56c68b22e414e53bd3be" dependencies = [ "futures-core", "futures-sink", @@ -3301,14 +3301,15 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.140" +version = "1.0.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" +checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" dependencies = [ "itoa", "memchr", - "ryu", "serde", + "serde_core", + "zmij", ] [[package]] @@ -5281,3 +5282,9 @@ dependencies = [ "quote", "syn 2.0.104", ] + +[[package]] +name = "zmij" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" diff --git a/sqlx-cli/Cargo.toml b/sqlx-cli/Cargo.toml index 32ba4d8a20..69b3964bb8 100644 --- a/sqlx-cli/Cargo.toml +++ b/sqlx-cli/Cargo.toml @@ -38,7 +38,7 @@ dialoguer = { version = "0.11", default-features = false } serde_json = "1.0.73" glob = "0.3.0" openssl = { version = "0.10.46", optional = true } -cargo_metadata = "0.18.1" +cargo_metadata = "0.23.1" filetime = "0.2" backoff = { version = "0.4.0", features = ["futures", "tokio"] } diff --git a/sqlx-cli/src/metadata.rs b/sqlx-cli/src/metadata.rs index e90d9c66c3..38afa9ba14 100644 --- a/sqlx-cli/src/metadata.rs +++ b/sqlx-cli/src/metadata.rs @@ -9,6 +9,7 @@ use std::{ use anyhow::Context; use cargo_metadata::{ Metadata as CargoMetadata, Package as MetadataPackage, PackageId as MetadataId, + PackageName as MetadataPackageName, }; /// The minimal amount of package information we care about @@ -17,13 +18,13 @@ use cargo_metadata::{ /// are used to trigger recompiles of packages within the workspace #[derive(Debug)] pub struct Package { - name: String, + name: MetadataPackageName, src_paths: Vec, } impl Package { pub fn name(&self) -> &str { - &self.name + self.name.as_str() } pub fn src_paths(&self) -> &[PathBuf] {