diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-04-03 17:06:53 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-04-04 16:47:08 -0700 |
| commit | 818b8a4cfc50c0695324fc1d025a7cf39203b2a7 (patch) | |
| tree | e591e3143a2f05ded1828b4db1b5bb8972a1c35c /toolsrc/src | |
| parent | dac8ace7619c863e0f59e4d68623e55ebf71e04d (diff) | |
| download | vcpkg-818b8a4cfc50c0695324fc1d025a7cf39203b2a7.tar.gz vcpkg-818b8a4cfc50c0695324fc1d025a7cf39203b2a7.zip | |
PacakgeSpec.toString() -> PackageSpec.to_string()
Diffstat (limited to 'toolsrc/src')
| -rw-r--r-- | toolsrc/src/PackageSpec.cpp | 6 | ||||
| -rw-r--r-- | toolsrc/src/commands_build.cpp | 10 | ||||
| -rw-r--r-- | toolsrc/src/commands_ci.cpp | 4 | ||||
| -rw-r--r-- | toolsrc/src/commands_install.cpp | 4 | ||||
| -rw-r--r-- | toolsrc/src/commands_remove.cpp | 6 |
5 files changed, 15 insertions, 15 deletions
diff --git a/toolsrc/src/PackageSpec.cpp b/toolsrc/src/PackageSpec.cpp index edb941799..fab0cc8b6 100644 --- a/toolsrc/src/PackageSpec.cpp +++ b/toolsrc/src/PackageSpec.cpp @@ -60,14 +60,14 @@ namespace vcpkg return Strings::format("%s_%s", this->m_name, this->m_target_triplet); } - std::string PackageSpec::toString() const + std::string PackageSpec::to_string() const { return this->display_name(); } std::string to_printf_arg(const PackageSpec& spec) { - return spec.toString(); + return spec.to_string(); } bool operator==(const PackageSpec& left, const PackageSpec& right) @@ -77,6 +77,6 @@ namespace vcpkg std::ostream& operator<<(std::ostream& os, const PackageSpec& spec) { - return os << spec.toString(); + return os << spec.to_string(); } } diff --git a/toolsrc/src/commands_build.cpp b/toolsrc/src/commands_build.cpp index 026e8da34..193339f0e 100644 --- a/toolsrc/src/commands_build.cpp +++ b/toolsrc/src/commands_build.cpp @@ -68,12 +68,12 @@ namespace vcpkg::Commands::Build int return_code = System::cmd_execute_clean(command); auto buildtimeus = timer.microseconds(); - Metrics::track_metric("buildtimeus-" + spec.toString(), buildtimeus); + Metrics::track_metric("buildtimeus-" + spec.to_string(), buildtimeus); if (return_code != 0) { Metrics::track_property("error", "build failed"); - Metrics::track_property("build_error", spec.toString()); + Metrics::track_property("build_error", spec.to_string()); return BuildResult::BUILD_FAILED; } @@ -113,7 +113,7 @@ namespace vcpkg::Commands::Build std::string create_error_message(const BuildResult build_result, const PackageSpec& spec) { - return Strings::format("Error: Building package %s failed with: %s", spec.toString(), Build::to_string(build_result)); + return Strings::format("Error: Building package %s failed with: %s", spec.to_string(), Build::to_string(build_result)); } std::string create_user_troubleshooting_message(const PackageSpec& spec) @@ -124,7 +124,7 @@ namespace vcpkg::Commands::Build " Vcpkg version: %s\n" "\n" "Additionally, attach any relevant sections from the log files above." - , spec.toString(), Version::version()); + , spec.to_string(), Version::version()); } void perform_and_exit(const PackageSpec& spec, const fs::path& port_dir, const std::unordered_set<std::string>& options, const VcpkgPaths& paths) @@ -158,7 +158,7 @@ namespace vcpkg::Commands::Build System::println(""); for (const PackageSpecWithInstallPlan& p : unmet_dependencies) { - System::println(" %s", p.spec.toString()); + System::println(" %s", p.spec.to_string()); } System::println(""); Checks::exit_fail(VCPKG_LINE_INFO); diff --git a/toolsrc/src/commands_ci.cpp b/toolsrc/src/commands_ci.cpp index d5067ae77..72137f8bb 100644 --- a/toolsrc/src/commands_ci.cpp +++ b/toolsrc/src/commands_ci.cpp @@ -48,7 +48,7 @@ namespace vcpkg::Commands::CI { const ElapsedTime build_timer = ElapsedTime::create_started(); counter++; - System::println("Starting package %d/%d: %s", counter, package_count, action.spec.toString()); + System::println("Starting package %d/%d: %s", counter, package_count, action.spec.to_string()); timing.push_back(-1); results.push_back(BuildResult::NULLVALUE); @@ -99,7 +99,7 @@ namespace vcpkg::Commands::CI for (size_t i = 0; i < results.size(); i++) { - System::println("%s: %s: %dms", install_plan[i].spec.toString(), Build::to_string(results[i]), timing[i]); + System::println("%s: %s: %dms", install_plan[i].spec.to_string(), Build::to_string(results[i]), timing[i]); } std::map<BuildResult, int> summary; diff --git a/toolsrc/src/commands_install.cpp b/toolsrc/src/commands_install.cpp index a101bc8e9..dec7f9ff4 100644 --- a/toolsrc/src/commands_install.cpp +++ b/toolsrc/src/commands_install.cpp @@ -204,11 +204,11 @@ namespace vcpkg::Commands::Install Checks::check_exit(VCPKG_LINE_INFO, !install_plan.empty(), "Install plan cannot be empty"); // log the plan - std::string specs_string = install_plan[0].spec.toString(); + std::string specs_string = install_plan[0].spec.to_string(); for (size_t i = 1; i < install_plan.size(); ++i) { specs_string.push_back(','); - specs_string.append(install_plan[i].spec.toString()); + specs_string.append(install_plan[i].spec.to_string()); } Metrics::track_property("installplan", specs_string); diff --git a/toolsrc/src/commands_remove.cpp b/toolsrc/src/commands_remove.cpp index 67d19e561..f5689067d 100644 --- a/toolsrc/src/commands_remove.cpp +++ b/toolsrc/src/commands_remove.cpp @@ -137,7 +137,7 @@ namespace vcpkg::Commands::Remove System::println("The following packages are not installed, so not removed:\n%s", Strings::join("\n ", not_installed, [](const PackageSpecWithRemovePlan* p) { - return " " + p->spec.toString(); + return " " + p->spec.to_string(); })); } @@ -149,12 +149,12 @@ namespace vcpkg::Commands::Remove { if (p->plan.request_type == Dependencies::RequestType::AUTO_SELECTED) { - return " * " + p->spec.toString(); + return " * " + p->spec.to_string(); } if (p->plan.request_type == Dependencies::RequestType::USER_REQUESTED) { - return " " + p->spec.toString(); + return " " + p->spec.to_string(); } Checks::unreachable(VCPKG_LINE_INFO); |
