Merge branch 'master' into vtk-components

1 files changed, 5 insertions, 11 deletions

diff --git a/toolsrc/src/BinaryParagraph.cpp b/toolsrc/src/BinaryParagraph.cpp
index 9abd388b9..1504912ab 100644
--- a/toolsrc/src/BinaryParagraph.cpp
+++ b/toolsrc/src/BinaryParagraph.cpp
@@ -56,7 +56,7 @@ namespace vcpkg
             this->default_features = parse_comma_list(parser.optional_field(Fields::DEFAULTFEATURES));
         }
 
-        if (auto err = parser.error_info(this->spec.to_string()))
+        if (const auto err = parser.error_info(this->spec.to_string()))
         {
             System::println(
                 System::Color::error, "Error: while parsing the Binary Paragraph for %s", this->spec.to_string());
@@ -80,23 +80,17 @@ namespace vcpkg
     BinaryParagraph::BinaryParagraph(const SourceParagraph& spgh, const FeatureParagraph& fpgh, const Triplet& triplet)
     {
         this->spec = PackageSpec::from_name_and_triplet(spgh.name, triplet).value_or_exit(VCPKG_LINE_INFO);
-        this->version = "";
+        this->version = Strings::EMPTY;
         this->feature = fpgh.name;
         this->description = fpgh.description;
-        this->maintainer = "";
+        this->maintainer = Strings::EMPTY;
         this->depends = filter_dependencies(fpgh.depends, triplet);
     }
 
     std::string BinaryParagraph::displayname() const
     {
-        if (this->feature == "")
-        {
-            return this->spec.name() + "[core]:" + this->spec.triplet().to_string();
-        }
-        else
-        {
-            return this->spec.name() + "[" + this->feature + "]:" + this->spec.triplet().to_string();
-        }
+        const auto f = this->feature.empty() ? "core" : this->feature;
+        return Strings::format("%s[%s]:%s", this->spec.name(), f, this->spec.triplet());
     }
 
     std::string BinaryParagraph::dir() const { return this->spec.dir(); }