chore: consolidate SourceSet variants into PopulationRange#826
Open
chore: consolidate SourceSet variants into PopulationRange#826
Conversation
Benchmark ResultsHyperfine
CriterionRegressions (slower)
Improvements (faster)
Unchanged / inconclusive (CI crosses 0%)
|
RobertJacobsonCDC
requested changes
Mar 31, 2026
| ) | ||
| } | ||
| /// Returns the contained entity id if this set is a singleton leaf. | ||
| fn as_singleton(&self) -> Option<EntityId<E>> { |
Collaborator
There was a problem hiding this comment.
I suspect once you start thinking about the simplification cases for intervals, this private helper method will disappear or be replaced with an interval analog.
Benchmark ResultsHyperfine
CriterionRegressions (slower)
Improvements (faster)
Unchanged / inconclusive (CI crosses 0%)
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
This PR refactors our entity source sets by consolidating the
Empty,Entity, andPopulationvariants into a single, unifiedPopulationRange(std::ops::Range<usize>).By mapping these sources to a standard contiguous range, we offload all the low-level iterator math, bounds checking, and size calculations to the standard library (
std::ops::Range), making the code significantly cleaner and less error-prone.Key Changes
SourceSetVariants: ReplacedSourceSet::Empty,SourceSet::Entity, andSourceSet::Populationwith the unifiedSourceSet::PopulationRange.PopulationIterator: Delegatedsize_hint(),count(), andnth()implementations directly to the underlying standardRangeiterator, abstracting away custom saturating math and manual bound tracking.EntitySetLogic:is_universal()algebraic reduction checks.as_singleton()to use a cleanrange.len() == 1check rather than manual checked arithmetic.entity_set.rs,entity_set_iterator.rs, andsource_set.rsto validate against the newPopulationRangestructures.