diff --git a/crates/bevy_ecs/src/entity/mod.rs b/crates/bevy_ecs/src/entity/mod.rs index 24a6f3a672..a6bf45da3d 100644 --- a/crates/bevy_ecs/src/entity/mod.rs +++ b/crates/bevy_ecs/src/entity/mod.rs @@ -450,26 +450,26 @@ pub struct ReserveEntitiesIterator<'a> { meta: &'a [EntityMeta], // Reserved indices formerly in the freelist to hand out. - index_iter: std::slice::Iter<'a, u32>, + freelist_indices: std::slice::Iter<'a, u32>, // New Entity indices to hand out, outside the range of meta.len(). - index_range: std::ops::Range, + new_indices: std::ops::Range, } impl<'a> Iterator for ReserveEntitiesIterator<'a> { type Item = Entity; fn next(&mut self) -> Option { - self.index_iter + self.freelist_indices .next() .map(|&index| { Entity::from_raw_and_generation(index, self.meta[index as usize].generation) }) - .or_else(|| self.index_range.next().map(Entity::from_raw)) + .or_else(|| self.new_indices.next().map(Entity::from_raw)) } fn size_hint(&self) -> (usize, Option) { - let len = self.index_iter.len() + self.index_range.len(); + let len = self.freelist_indices.len() + self.new_indices.len(); (len, Some(len)) } } @@ -589,8 +589,8 @@ impl Entities { ReserveEntitiesIterator { meta: &self.meta[..], - index_iter: self.pending[freelist_range].iter(), - index_range: new_id_start..new_id_end, + freelist_indices: self.pending[freelist_range].iter(), + new_indices: new_id_start..new_id_end, } }