Skip to content

Commit d96c93c

Browse files
committed
dep: drop unnecessary unit attributes for Dep and DepSet objects
Pulling them when needed from the underlying C objects instead.
1 parent 0250aff commit d96c93c

4 files changed

Lines changed: 5 additions & 9 deletions

File tree

src/pkgcraft/dep/base.pxd

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ from ..error cimport _IndirectInit
44

55
cdef class Dep(_IndirectInit):
66
cdef C.Dep *ptr
7-
cdef C.DepUnit unit
87

98
@staticmethod
109
cdef Dep from_ptr(C.Dep *)

src/pkgcraft/dep/base.pyx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ cdef class Dep(_IndirectInit):
3333
raise TypeError(f'unknown Dep kind: {kind}')
3434

3535
obj.ptr = ptr
36-
obj.unit = ptr.unit
3736
return obj
3837

3938
def iter_flatten(self):

src/pkgcraft/dep/set.pxd

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ from ..error cimport _IndirectInit
44

55
cdef class DepSet(_IndirectInit):
66
cdef C.DepSet *ptr
7-
cdef C.DepUnit unit
87

98
@staticmethod
109
cdef DepSet from_ptr(C.DepSet *, DepSet obj=*)

src/pkgcraft/dep/set.pyx

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ cdef class DepSet(_IndirectInit):
3333
raise TypeError(f'unknown DepSet kind: {kind}')
3434

3535
obj.ptr = ptr
36-
obj.unit = ptr.unit
3736
return obj
3837
return None
3938

@@ -148,7 +147,7 @@ cdef class _IntoIter:
148147

149148
def __cinit__(self, DepSet d not None):
150149
self.ptr = C.pkgcraft_depset_into_iter(d.ptr)
151-
self.unit = d.unit
150+
self.unit = d.ptr.unit
152151

153152
def __iter__(self):
154153
return self
@@ -170,11 +169,11 @@ cdef class _IntoIterFlatten:
170169
if isinstance(obj, DepSet):
171170
deps = <DepSet>obj
172171
self.ptr = C.pkgcraft_depset_into_iter_flatten(deps.ptr)
173-
self.unit = deps.unit
172+
self.unit = deps.ptr.unit
174173
elif isinstance(obj, Dep):
175174
dep = <Dep>obj
176175
self.ptr = C.pkgcraft_dep_into_iter_flatten(dep.ptr)
177-
self.unit = dep.unit
176+
self.unit = dep.ptr.unit
178177
else: # pragma: no cover
179178
raise TypeError(f"{obj.__class__.__name__!r} unsupported depset type")
180179

@@ -208,11 +207,11 @@ cdef class _IntoIterRecursive:
208207
if isinstance(obj, DepSet):
209208
deps = <DepSet>obj
210209
self.ptr = C.pkgcraft_depset_into_iter_recursive(deps.ptr)
211-
self.unit = deps.unit
210+
self.unit = deps.ptr.unit
212211
elif isinstance(obj, Dep):
213212
dep = <Dep>obj
214213
self.ptr = C.pkgcraft_dep_into_iter_recursive(dep.ptr)
215-
self.unit = dep.unit
214+
self.unit = dep.ptr.unit
216215
else: # pragma: no cover
217216
raise TypeError(f"{obj.__class__.__name__!r} unsupported depset type")
218217

0 commit comments

Comments
 (0)