itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-09-28 11:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(remove): Consolidate how we mutate manifests

Browse Source 
This will make it easier to add cargo script support
This commit is contained in:
Ed Page 2024-11-25 10:40:59 -06:00
parent 6ebd1aec17
commit 0b99414479
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/bin/cargo/commands/remove.rs
View File

@ -161,8 +161,7 @@ fn parse_section(args: &ArgMatches) -> DepTable {
/// Clean up the workspace.dependencies, profile, patch, and replace sections of the root manifest
/// by removing dependencies which no longer have a reference to them.
fn gc_workspace(workspace: &Workspace<'_>) -> CargoResult<()> {
let mut workspace_manifest: toml_edit::DocumentMut =
cargo_util::paths::read(workspace.root_manifest())?.parse()?;
let mut workspace_manifest = LocalManifest::try_new(workspace.root_manifest())?;
let mut is_modified = true;
let members = workspace
@ -204,6 +203,7 @@ fn gc_workspace(workspace: &Workspace<'_>) -> CargoResult<()> {
// Clean up the workspace.dependencies section and replace instances of
// workspace dependencies with their definitions
if let Some(toml_edit::Item::Table(deps_table)) = workspace_manifest
.data
.get_mut("workspace")
.and_then(|t| t.get_mut("dependencies"))
{
@ -247,7 +247,7 @@ fn gc_workspace(workspace: &Workspace<'_>) -> CargoResult<()> {
// - profile.dev.package.foo
// - profile.release.package."foo:2.1.0"
if let Some(toml_edit::Item::Table(profile_section_table)) =
workspace_manifest.get_mut("profile")
workspace_manifest.data.get_mut("profile")
{
profile_section_table.set_implicit(true);
@ -282,7 +282,7 @@ fn gc_workspace(workspace: &Workspace<'_>) -> CargoResult<()> {
}
// Clean up the replace section
if let Some(toml_edit::Item::Table(table)) = workspace_manifest.get_mut("replace") {
if let Some(toml_edit::Item::Table(table)) = workspace_manifest.data.get_mut("replace") {
table.set_implicit(true);
for (key, item) in table.iter_mut() {
@ -298,10 +298,7 @@ fn gc_workspace(workspace: &Workspace<'_>) -> CargoResult<()> {
}
if is_modified {
cargo_util::paths::write_atomic(
workspace.root_manifest(),
workspace_manifest.to_string().as_bytes(),
)?;
workspace_manifest.write()?;
}
Ok(())
@ -342,12 +339,13 @@ fn spec_has_match(
/// Removes unused patches from the manifest
fn gc_unused_patches(workspace: &Workspace<'_>, resolve: &Resolve) -> CargoResult<bool> {
let mut workspace_manifest: toml_edit::DocumentMut =
cargo_util::paths::read(workspace.root_manifest())?.parse()?;
let mut workspace_manifest = LocalManifest::try_new(workspace.root_manifest())?;
let mut modified = false;
// Clean up the patch section
if let Some(toml_edit::Item::Table(patch_section_table)) = workspace_manifest.get_mut("patch") {
if let Some(toml_edit::Item::Table(patch_section_table)) =
workspace_manifest.data.get_mut("patch")
{
patch_section_table.set_implicit(true);
for (_, item) in patch_section_table.iter_mut() {
@ -385,10 +383,7 @@ fn gc_unused_patches(workspace: &Workspace<'_>, resolve: &Resolve) -> CargoResul
}
if modified {
cargo_util::paths::write(
workspace.root_manifest(),
workspace_manifest.to_string().as_bytes(),
)?;
workspace_manifest.write()?;
}
Ok(modified)