refactor(remove): Clarify variable names

Author: epage

src/bin/cargo/commands/remove.rs

@@ -161,7 +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 manifest: toml_edit::DocumentMut =
+    let mut workspace_manifest: toml_edit::DocumentMut =
         cargo_util::paths::read(workspace.root_manifest())?.parse()?;
     let mut is_modified = true;
 
@@ -177,8 +177,8 @@ fn gc_workspace(workspace: &Workspace<'_>) -> CargoResult<()> {
 
     let mut dependencies = members
         .into_iter()
-        .flat_map(|(manifest, unstable_features)| {
-            manifest
+        .flat_map(|(member_manifest, unstable_features)| {
+            member_manifest
                 .get_sections()
                 .into_iter()
                 .flat_map(move |(_, table)| {
@@ -190,7 +190,7 @@ fn gc_workspace(workspace: &Workspace<'_>) -> CargoResult<()> {
                             Dependency::from_toml(
                                 workspace.gctx(),
                                 workspace.root(),
-                                &manifest.path,
+                                &member_manifest.path,
                                 &unstable_features,
                                 key,
                                 item,
@@ -203,7 +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)) = manifest
+    if let Some(toml_edit::Item::Table(deps_table)) = workspace_manifest
         .get_mut("workspace")
         .and_then(|t| t.get_mut("dependencies"))
     {
@@ -246,7 +246,9 @@ fn gc_workspace(workspace: &Workspace<'_>) -> CargoResult<()> {
     // Example tables:
     // - profile.dev.package.foo
     // - profile.release.package."foo:2.1.0"
-    if let Some(toml_edit::Item::Table(profile_section_table)) = manifest.get_mut("profile") {
+    if let Some(toml_edit::Item::Table(profile_section_table)) =
+        workspace_manifest.get_mut("profile")
+    {
         profile_section_table.set_implicit(true);
 
         for (_, item) in profile_section_table.iter_mut() {
@@ -280,7 +282,7 @@ fn gc_workspace(workspace: &Workspace<'_>) -> CargoResult<()> {
     }
 
     // Clean up the replace section
-    if let Some(toml_edit::Item::Table(table)) = manifest.get_mut("replace") {
+    if let Some(toml_edit::Item::Table(table)) = workspace_manifest.get_mut("replace") {
         table.set_implicit(true);
 
         for (key, item) in table.iter_mut() {
@@ -298,7 +300,7 @@ fn gc_workspace(workspace: &Workspace<'_>) -> CargoResult<()> {
     if is_modified {
         cargo_util::paths::write_atomic(
             workspace.root_manifest(),
-            manifest.to_string().as_bytes(),
+            workspace_manifest.to_string().as_bytes(),
         )?;
     }
 
@@ -340,12 +342,12 @@ fn spec_has_match(
 
 /// Removes unused patches from the manifest
 fn gc_unused_patches(workspace: &Workspace<'_>, resolve: &Resolve) -> CargoResult<bool> {
-    let mut manifest: toml_edit::DocumentMut =
+    let mut workspace_manifest: toml_edit::DocumentMut =
         cargo_util::paths::read(workspace.root_manifest())?.parse()?;
     let mut modified = false;
 
     // Clean up the patch section
-    if let Some(toml_edit::Item::Table(patch_section_table)) = manifest.get_mut("patch") {
+    if let Some(toml_edit::Item::Table(patch_section_table)) = workspace_manifest.get_mut("patch") {
         patch_section_table.set_implicit(true);
 
         for (_, item) in patch_section_table.iter_mut() {
@@ -383,7 +385,10 @@ fn gc_unused_patches(workspace: &Workspace<'_>, resolve: &Resolve) -> CargoResul
     }
 
     if modified {
-        cargo_util::paths::write(workspace.root_manifest(), manifest.to_string().as_bytes())?;
+        cargo_util::paths::write(
+            workspace.root_manifest(),
+            workspace_manifest.to_string().as_bytes(),
+        )?;
     }
 
     Ok(modified)