Merge branch 'master' into master

1 files changed, 12 insertions, 13 deletions

diff --git a/toolsrc/include/SourceParagraph.h b/toolsrc/include/SourceParagraph.h
index 7ddf999cc..1357b3769 100644
--- a/toolsrc/include/SourceParagraph.h
+++ b/toolsrc/include/SourceParagraph.h
@@ -1,27 +1,32 @@
 #pragma once
 
+#include "PackageSpec.h"
 #include "Span.h"
 #include "vcpkg_Parse.h"
 #include "vcpkg_System.h"
 #include "vcpkg_expected.h"
 
 #include <string>
-#include <unordered_map>
 #include <vector>
 
 namespace vcpkg
 {
-    extern bool g_feature_packages;
-
-    struct Triplet;
-
     struct Dependency
     {
-        std::string name;
+        Features depend;
         std::string qualifier;
+
+        std::string name() const;
+        static Dependency parse_dependency(std::string name, std::string qualifier);
     };
 
-    const std::string& to_string(const Dependency& dep);
+    std::vector<std::string> filter_dependencies(const std::vector<Dependency>& deps, const Triplet& t);
+    std::vector<FeatureSpec> filter_dependencies_to_specs(const std::vector<Dependency>& deps, const Triplet& t);
+
+    // zlib[uwp] becomes Dependency{"zlib", "uwp"}
+    std::vector<Dependency> expand_qualified_dependencies(const std::vector<std::string>& depends);
+
+    std::string to_string(const Dependency& dep);
 
     struct FeatureParagraph
     {
@@ -58,12 +63,6 @@ namespace vcpkg
         return print_error_message({&error_info_list, 1});
     }
 
-    std::vector<std::string> filter_dependencies(const std::vector<Dependency>& deps, const Triplet& t);
-
-    // zlib[uwp] becomes Dependency{"zlib", "uwp"}
-    std::vector<Dependency> expand_qualified_dependencies(const std::vector<std::string>& depends);
-    std::vector<std::string> parse_comma_list(const std::string& str);
-
     struct Supports
     {
         static ExpectedT<Supports, std::vector<std::string>> parse(const std::vector<std::string>& strs);