From 8d283b3c55cbe54ed3db7310a7776f9ed1c5641e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 7 Jul 2026 22:53:07 +0000 Subject: [PATCH 1/2] chore(ci): Update Rust crate cargo_toml to v1 --- Cargo.lock | 37 +++++++++++++++++++++---------------- Cargo.toml | 2 +- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c1ead8a265..d3a9af9673 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1444,12 +1444,13 @@ dependencies = [ [[package]] name = "cargo_toml" -version = "0.22.3" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374b7c592d9c00c1f4972ea58390ac6b18cbb6ab79011f3bdc90a0b82ca06b77" +checksum = "aa61aec073ec94791433ddf3df2323ff9d1711557c2a0eefb0f99cb4f8dca520" dependencies = [ + "semver", "serde", - "toml 0.9.12+spec-1.1.0", + "toml 1.1.2+spec-1.1.0", ] [[package]] @@ -2483,7 +2484,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -2517,7 +2518,7 @@ checksum = "ad5208a115eaba24916f7456929832e310a81518c641f93fee4f89aa93aa3675" dependencies = [ "cfg-if 1.0.4", "libc", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -2773,7 +2774,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -4124,7 +4125,7 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "82cb6a9f675da968c63b6208c641b9dca58fc0133ae53375736b1767b0cab8bd" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -4550,7 +4551,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8cfc352a66ba903c23239ef51e809508b6fc2b0f90e3476ac7a9ff47e863ae95" dependencies = [ "scopeguard", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -4560,7 +4561,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "160f2eade097f30263b548aae5deb12ad349c909baa710fa24b92c9090b2e006" dependencies = [ "scopeguard", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -4578,7 +4579,7 @@ version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a1886916523694cd6ea3d175f03a1e5010699a2a4cc13696d83d7bea1d80638" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -5164,7 +5165,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -9425,7 +9426,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.12.1", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -9505,7 +9506,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs 1.0.8", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -9765,6 +9766,10 @@ name = "semver" version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd" +dependencies = [ + "serde", + "serde_core", +] [[package]] name = "send_wrapper" @@ -10844,7 +10849,7 @@ dependencies = [ "getrandom 0.4.2", "once_cell", "rustix 1.1.4", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -10854,7 +10859,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "230a1b821ccbd75b185820a1f1ff7b14d21da1e442e22c0863ea5f08771a8874" dependencies = [ "rustix 1.1.4", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -13225,7 +13230,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index f1b1eddd9d..f699d45e1c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,7 +34,7 @@ async-trait = "0.1.86" axum = "0.8" barrier_cell = { path = "crates/barrier_cell" } base64 = "0.22.1" -cargo_toml = "0.22.3" +cargo_toml = "1.0.0" chrono = "0.4.40" clap = { version = "4.6.1", default-features = false } clap-verbosity-flag = "3.0.2" From 3356cec93072b4bc69f9af51091bb857a790abd0 Mon Sep 17 00:00:00 2001 From: Lucas Colley Date: Wed, 8 Jul 2026 00:01:46 +0100 Subject: [PATCH 2/2] chore: adjust to new version type from `cargo_toml` --- crates/pixi_build_rust/src/main.rs | 9 ++++++++- crates/pixi_build_rust/src/metadata.rs | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/crates/pixi_build_rust/src/main.rs b/crates/pixi_build_rust/src/main.rs index b58a94d7f1..669cc8bbb3 100644 --- a/crates/pixi_build_rust/src/main.rs +++ b/crates/pixi_build_rust/src/main.rs @@ -658,7 +658,14 @@ mod tests { generated_recipe.recipe.package.name.to_string() ); assert_eq!( - *manifest.clone().package.unwrap().version.get().unwrap(), + *manifest + .clone() + .package + .unwrap() + .version + .get() + .unwrap() + .to_string(), generated_recipe.recipe.package.version.to_string() ); assert_eq!( diff --git a/crates/pixi_build_rust/src/metadata.rs b/crates/pixi_build_rust/src/metadata.rs index 0111e78f13..896a24fd46 100644 --- a/crates/pixi_build_rust/src/metadata.rs +++ b/crates/pixi_build_rust/src/metadata.rs @@ -178,7 +178,7 @@ impl MetadataProvider for CargoMetadataProvider { })?, }; Ok(Some( - Version::from_str(version).map_err(MetadataError::ParseVersionError)?, + Version::from_str(&version.to_string()).map_err(MetadataError::ParseVersionError)?, )) }