Renames and formatting

3 files changed, 9 insertions, 9 deletions

diff --git a/toolsrc/include/vcpkg_Dependencies.h b/toolsrc/include/vcpkg_Dependencies.h
index 2a3030c89..5b0bf3187 100644
--- a/toolsrc/include/vcpkg_Dependencies.h
+++ b/toolsrc/include/vcpkg_Dependencies.h
@@ -16,8 +16,8 @@ namespace vcpkg::Dependencies
     struct install_plan_action
     {
         install_plan_type type;
-        std::unique_ptr<BinaryParagraph> bpgh;
-        std::unique_ptr<SourceParagraph> spgh;
+        std::unique_ptr<BinaryParagraph> binary_pgh;
+        std::unique_ptr<SourceParagraph> source_pgh;
     };
 
     struct package_spec_with_install_plan
diff --git a/toolsrc/src/commands_install.cpp b/toolsrc/src/commands_install.cpp
index dabce44f6..e5c5dd013 100644
--- a/toolsrc/src/commands_install.cpp
+++ b/toolsrc/src/commands_install.cpp
@@ -214,14 +214,14 @@ namespace vcpkg::Commands::Install
                 }
                 else if (action.plan.type == install_plan_type::BUILD_AND_INSTALL)
                 {
-                    Commands::Build::build_package(*action.plan.spgh, action.spec, paths, paths.port_dir(action.spec));
+                    Commands::Build::build_package(*action.plan.source_pgh, action.spec, paths, paths.port_dir(action.spec));
                     const BinaryParagraph bpgh = try_load_cached_package(paths, action.spec).get_or_throw();
                     install_package(paths, bpgh, status_db);
                     System::println(System::color::success, "Package %s is installed", action.spec);
                 }
                 else if (action.plan.type == install_plan_type::INSTALL)
                 {
-                    install_package(paths, *action.plan.bpgh, status_db);
+                    install_package(paths, *action.plan.binary_pgh, status_db);
                     System::println(System::color::success, "Package %s is installed", action.spec);
                 }
                 else
diff --git a/toolsrc/src/vcpkg_Dependencies.cpp b/toolsrc/src/vcpkg_Dependencies.cpp
index 5de782e73..b0047a772 100644
--- a/toolsrc/src/vcpkg_Dependencies.cpp
+++ b/toolsrc/src/vcpkg_Dependencies.cpp
@@ -66,7 +66,7 @@ namespace vcpkg::Dependencies
         const std::vector<package_spec> pkgs = graph.find_topological_sort();
         for (const package_spec& pkg : pkgs)
         {
-            ret.push_back({ pkg, std::move(was_examined[pkg]) });
+            ret.push_back({pkg, std::move(was_examined[pkg])});
         }
         return ret;
     }
@@ -93,7 +93,7 @@ namespace vcpkg::Dependencies
             auto it = status_db.find(spec);
             if (it == status_db.end() || (*it)->state == install_state_t::not_installed)
             {
-                was_examined.emplace(spec, remove_plan_action{ remove_plan_type::NOT_INSTALLED, nullptr});
+                was_examined.emplace(spec, remove_plan_action{remove_plan_type::NOT_INSTALLED, nullptr});
                 continue;
             }
 
@@ -114,8 +114,8 @@ namespace vcpkg::Dependencies
                 examine_stack.push_back(an_installed_package.get()->package.spec);
             }
 
-            const remove_plan_type type = specs_as_set.find(spec) != specs_as_set.end() ? remove_plan_type::REMOVE_USER_REQUESTED: remove_plan_type::REMOVE_AUTO_SELECTED;
-            was_examined.emplace(spec, remove_plan_action{ type, std::make_unique<StatusParagraph>(std::move(**it))});
+            const remove_plan_type type = specs_as_set.find(spec) != specs_as_set.end() ? remove_plan_type::REMOVE_USER_REQUESTED : remove_plan_type::REMOVE_AUTO_SELECTED;
+            was_examined.emplace(spec, remove_plan_action{type, std::make_unique<StatusParagraph>(std::move(**it))});
         }
 
         std::vector<package_spec_with_remove_plan> ret;
@@ -123,7 +123,7 @@ namespace vcpkg::Dependencies
         const std::vector<package_spec> pkgs = graph.find_topological_sort();
         for (const package_spec& pkg : pkgs)
         {
-            ret.push_back({ pkg, std::move(was_examined[pkg]) });
+            ret.push_back({pkg, std::move(was_examined[pkg])});
         }
         return ret;
     }