[vcpkg] ImmutableSortedVector is actually Mutable via move.

Use fmap instead of construct/insert.
Don't cache VS2015 instances since it is called once.
Add ParagraphDataMap alias.

1 files changed, 6 insertions, 4 deletions

diff --git a/toolsrc/include/Paragraphs.h b/toolsrc/include/Paragraphs.h
index 39880192c..26f81ffad 100644
--- a/toolsrc/include/Paragraphs.h
+++ b/toolsrc/include/Paragraphs.h
@@ -9,10 +9,12 @@
 
 namespace vcpkg::Paragraphs
 {
-    expected<std::unordered_map<std::string, std::string>> get_single_paragraph(const fs::path& control_path);
-    expected<std::vector<std::unordered_map<std::string, std::string>>> get_paragraphs(const fs::path& control_path);
-    expected<std::unordered_map<std::string, std::string>> parse_single_paragraph(const std::string& str);
-    expected<std::vector<std::unordered_map<std::string, std::string>>> parse_paragraphs(const std::string& str);
+    using ParagraphDataMap = std::unordered_map<std::string, std::string>;
+
+    expected<ParagraphDataMap> get_single_paragraph(const fs::path& control_path);
+    expected<std::vector<ParagraphDataMap>> get_paragraphs(const fs::path& control_path);
+    expected<ParagraphDataMap> parse_single_paragraph(const std::string& str);
+    expected<std::vector<ParagraphDataMap>> parse_paragraphs(const std::string& str);
 
     expected<SourceParagraph> try_load_port(const fs::path& control_path);