Skip to content

Commit c862b6f

Browse files
authored
Merge pull request #4874 from Zac-HD/claude/cu-many-reject-span-discard-yhaidc
Mark rejected many() elements' spans as discarded
2 parents df39994 + 1d0e155 commit c862b6f

3 files changed

Lines changed: 28 additions & 3 deletions

File tree

‎hypothesis/RELEASE.rst‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
RELEASE_TYPE: patch
2+
3+
This patch improves shrinking and generation for collection strategies which
4+
reject some drawn elements, such as :func:`~hypothesis.strategies.lists` with
5+
``unique=True``. Rejected elements are now marked as discarded, so the
6+
shrinker can delete them wholesale and generation avoids revisiting
7+
choices that would be rejected again.

‎hypothesis/src/hypothesis/internal/conjecture/utils.py‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -295,9 +295,9 @@ def __init__(
295295
self.rejected = False
296296
self.observe = observe
297297

298-
def stop_span(self):
298+
def stop_span(self, *, discard: bool = False) -> None:
299299
if self.observe:
300-
self.data.stop_span()
300+
self.data.stop_span(discard=discard)
301301

302302
def start_span(self, label):
303303
if self.observe:
@@ -306,7 +306,9 @@ def start_span(self, label):
306306
def more(self) -> bool:
307307
"""Should I draw another element to add to the collection?"""
308308
if self.drawn:
309-
self.stop_span()
309+
# A rejected element does not contribute to the collection, so
310+
# discard its span - the shrinker can then delete it wholesale.
311+
self.stop_span(discard=self.rejected)
310312

311313
self.drawn = True
312314
self.rejected = False

‎hypothesis/tests/conjecture/test_utils.py‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,22 @@ def test_rejection_eventually_terminates_many_invalid_for_min_size():
180180
assert data.status == Status.INVALID
181181

182182

183+
def test_rejected_element_span_is_discarded():
184+
data = ConjectureData.for_choices([True, 0, True, 1, False])
185+
many = cu.many(data, min_size=0, max_size=10, average_size=5)
186+
while many.more():
187+
if data.draw_integer(0, 10) == 0:
188+
many.reject()
189+
data.freeze()
190+
191+
discards = [
192+
span.discarded for span in data.spans if span.label == cu.ONE_FROM_MANY_LABEL
193+
]
194+
# the rejected first element is discarded; the second and the final
195+
# stop-drawing span are not.
196+
assert discards == [True, False, False]
197+
198+
183199
def test_many_with_min_size():
184200
many = cu.many(
185201
ConjectureData.for_choices((False,) * 5),

0 commit comments

Comments
 (0)