dep: support UseDep objects for dependency types __contains__()

Author: radhermit

src/pkgcraft/C.pxd

@@ -821,6 +821,12 @@ cdef extern from "pkgcraft.h":
     # The arguments must be valid pointers.
     bool pkgcraft_dependency_contains_str(Dependency *d, const char *s)
 
+    # Determine if a Dependency contains a given UseDep.
+    #
+    # # Safety
+    # The arguments must be valid pointers.
+    bool pkgcraft_dependency_contains_use_dep(Dependency *d, UseDep *u)
+
     # Evaluate a Dependency.
     #
     # # Safety
@@ -920,6 +926,12 @@ cdef extern from "pkgcraft.h":
     # The arguments must be valid pointers.
     bool pkgcraft_dependency_set_contains_str(DependencySet *d, const char *s)
 
+    # Determine if a DependencySet contains a given UseDep.
+    #
+    # # Safety
+    # The arguments must be valid pointers.
+    bool pkgcraft_dependency_set_contains_use_dep(DependencySet *d, UseDep *u)
+
     # Determine if two DependencySets are equal.
     #
     # # Safety

src/pkgcraft/dep/base.pyx

@@ -147,6 +147,8 @@ cdef class Dependency:
             return C.pkgcraft_dependency_contains_dependency(self.ptr, (<Dependency>obj).ptr)
         elif isinstance(obj, str):
             return C.pkgcraft_dependency_contains_str(self.ptr, obj.encode())
+        elif isinstance(obj, UseDep):
+            return C.pkgcraft_dependency_contains_use_dep(self.ptr, (<UseDep>obj).ptr)
         return False
 
     def __iter__(self):
@@ -401,6 +403,8 @@ cdef class DependencySet:
             return C.pkgcraft_dependency_set_contains_dependency(self.ptr, (<Dependency>obj).ptr)
         elif isinstance(obj, str):
             return C.pkgcraft_dependency_set_contains_str(self.ptr, obj.encode())
+        elif isinstance(obj, UseDep):
+            return C.pkgcraft_dependency_set_contains_use_dep(self.ptr, (<UseDep>obj).ptr)
         return False
 
     def __iter__(self):

tests/dep/test_base.py

@@ -150,13 +150,20 @@ def test_eq_and_hash(self):
             assert len({d1, d2}) == 2
 
     def test_contains(self):
-        # Dependency objects
         d = Dependency.required_use("!u1? ( a u2? ( b ) )")
+
+        # Dependency objects
         assert d in d
         assert Dependency.required_use("a") in d
         assert Dependency.required_use("u2? ( b )") in d
         assert Dependency.required_use("b") in d
 
+        # UseDep objects
+        assert UseDep("!u1?") in d
+        assert UseDep("u2?") in d
+        assert UseDep("u1") not in d
+        assert UseDep("u") not in d
+
         # substrings
         assert "u2?" in d
         assert "b ) )" in d
@@ -414,18 +421,26 @@ def test_evaluate(self):
         assert not d1.evaluate(False)
 
     def test_contains(self):
+        d = self.cls("!u1? ( a/b u2? ( b/c ) ) c/d")
+
         # Dependency objects
-        assert Dependency("a/b") in self.cls("a/b")
-        assert Dependency("a/b") in self.cls("u? ( a/b )")
+        assert Dependency("c/d") in d
+        assert Dependency("u2? ( b/c )") in d
+
+        # UseDep objects
+        assert UseDep("!u1?") in d
+        assert UseDep("u2?") in d
+        assert UseDep("u1") not in d
+        assert UseDep("u") not in d
 
         # substrings
-        assert "a/b" in self.cls("a/b")
-        assert "u? ( c/d )" in self.cls("a/b u? ( c/d )")
-        assert "u?" in self.cls("a/b u? ( c/d )")
-        assert " ( " in self.cls("a/b u? ( c/d )")
+        assert "a/b" in d
+        assert "u2? ( b/c )" in d
+        assert "u2?" in d
+        assert " ( " in d
 
         # all other object types return False
-        assert None not in self.cls("a/b")
+        assert None not in d
 
     def test_eq_and_hash(self):
         # ordering that doesn't matter for equivalence and hashing