From 30a0acc0ff38dcc52ca8092f053c2c7f33c7b5dd Mon Sep 17 00:00:00 2001 From: Steven Malis Date: Tue, 7 Jan 2025 14:26:27 -0500 Subject: [PATCH 1/2] xsync: Tolerate arbitrary base workspace metadata --- xsync/xsync/src/tasks/cargo_toml.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xsync/xsync/src/tasks/cargo_toml.rs b/xsync/xsync/src/tasks/cargo_toml.rs index 2462223f83..d6cd51aae2 100644 --- a/xsync/xsync/src/tasks/cargo_toml.rs +++ b/xsync/xsync/src/tasks/cargo_toml.rs @@ -51,8 +51,9 @@ impl Cmd for CargoToml { // parse the Cargo.toml to sync with let base_cargo_toml = fs_err::read_to_string(ctx.base_workspace.join("Cargo.toml"))?; - let base_cargo_toml = - cargo_toml::Manifest::<()>::from_slice_with_metadata(base_cargo_toml.as_bytes())?; + let base_cargo_toml = cargo_toml::Manifest::::from_slice_with_metadata( + base_cargo_toml.as_bytes(), + )?; // // handle simple inherited Cargo.toml fields From 8a3debcd642fdef4b2ad4a30880e85a990596551 Mon Sep 17 00:00:00 2001 From: Steven Malis Date: Tue, 7 Jan 2025 14:31:26 -0500 Subject: [PATCH 2/2] Shorten --- xsync/xsync/src/tasks/cargo_toml.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/xsync/xsync/src/tasks/cargo_toml.rs b/xsync/xsync/src/tasks/cargo_toml.rs index d6cd51aae2..bff5c153cc 100644 --- a/xsync/xsync/src/tasks/cargo_toml.rs +++ b/xsync/xsync/src/tasks/cargo_toml.rs @@ -51,9 +51,8 @@ impl Cmd for CargoToml { // parse the Cargo.toml to sync with let base_cargo_toml = fs_err::read_to_string(ctx.base_workspace.join("Cargo.toml"))?; - let base_cargo_toml = cargo_toml::Manifest::::from_slice_with_metadata( - base_cargo_toml.as_bytes(), - )?; + let base_cargo_toml = + cargo_toml::Manifest::::from_slice(base_cargo_toml.as_bytes())?; // // handle simple inherited Cargo.toml fields