Skip to content

Commit bfb3cfd

Browse files
committed
dep: update UseDep default handling for pkgcraft changes
1 parent e301969 commit bfb3cfd

File tree

3 files changed

+5
-15
lines changed

3 files changed

+5
-15
lines changed

src/pkgcraft/C.pxd

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,6 @@ cdef extern from "pkgcraft.h":
9595
SLOT_OPERATOR_EQUAL # = 1,
9696
SLOT_OPERATOR_STAR,
9797

98-
# Package USE dependency default when missing.
99-
cdef enum UseDepDefault:
100-
USE_DEP_DEFAULT_DISABLED,
101-
USE_DEP_DEFAULT_ENABLED,
102-
10398
# System config
10499
cdef struct Config:
105100
pass
@@ -214,7 +209,7 @@ cdef extern from "pkgcraft.h":
214209
cdef struct UseDep:
215210
UseDepKind kind
216211
char *flag
217-
UseDepDefault *default_
212+
bool *default_
218213
UseDepWrapper *dep
219214

220215
# C-compatible wrapper for pkgcraft::dep::Dependency.

src/pkgcraft/dep/use_dep.pyx

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@ class UseDepKind(IntEnum):
1212
Conditional = C.USE_DEP_KIND_CONDITIONAL
1313

1414

15-
class UseDepDefault(IntEnum):
16-
Disabled = C.USE_DEP_DEFAULT_DISABLED
17-
Enabled = C.USE_DEP_DEFAULT_ENABLED
18-
19-
2015
cdef class UseDep:
2116
"""Package USE dependency."""
2217

@@ -49,7 +44,7 @@ cdef class UseDep:
4944
'use'
5045
>>> u.kind == UseDepKind.Equal
5146
True
52-
>>> u.default == UseDepDefault.Enabled
47+
>>> u.default == True
5348
True
5449
>>> str(u)
5550
'use(+)='
@@ -80,7 +75,7 @@ cdef class UseDep:
8075
if ptr.default_ is NULL:
8176
inst.default_ = None
8277
else:
83-
inst.default_ = UseDepDefault(ptr.default_[0])
78+
inst.default_ = ptr.default_[0]
8479
return inst
8580

8681
# Re-export the default field using its proper name, if exposed directly via

tests/dep/test_use_dep.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ def test_creation(self):
1111
# valid
1212
for d, default in (
1313
("", None),
14-
("(+)", UseDepDefault.Enabled),
15-
("(-)", UseDepDefault.Disabled),
14+
("(+)", True),
15+
("(-)", False),
1616
):
1717
for s, kind, enabled in (
1818
(f"u{d}", UseDepKind.Enabled, True),

0 commit comments

Comments
 (0)