From 0a60de877d8ce1ea39359d675071ce0c2a4b7201 Mon Sep 17 00:00:00 2001 From: Lukas Wirth Date: Sun, 1 Feb 2026 13:14:44 +0100 Subject: [PATCH] Remove unnecessary `boxcar::Vec` --- src/zalsa.rs | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/src/zalsa.rs b/src/zalsa.rs index d550b4c1f..9686a6d32 100644 --- a/src/zalsa.rs +++ b/src/zalsa.rs @@ -159,7 +159,7 @@ pub struct Zalsa { ingredients_vec: Vec>, /// Indices of ingredients that require reset when a new revision starts. - ingredients_requiring_reset: boxcar::Vec, + ingredients_requiring_reset: Vec, /// The runtime for this particular salsa database handle. /// Each handle gets its own runtime, but the runtimes have shared state between them. @@ -185,7 +185,7 @@ impl Zalsa { jar_map: HashMap::default(), ingredient_to_id_struct_type_id_map: Default::default(), ingredients_vec: Vec::new(), - ingredients_requiring_reset: boxcar::Vec::new(), + ingredients_requiring_reset: Vec::new(), runtime: Runtime::default(), memo_ingredient_indices: Default::default(), event_callback, @@ -438,14 +438,9 @@ impl Zalsa { let new_revision = self.runtime.new_revision(); let _span = crate::tracing::debug_span!("new_revision", ?new_revision).entered(); - for (_, index) in self.ingredients_requiring_reset.iter() { - let index = index.as_u32() as usize; - let ingredient = self - .ingredients_vec - .get_mut(index) - .unwrap_or_else(|| panic!("index `{index}` is uninitialized")); - - ingredient.reset_for_new_revision(self.runtime.table_mut()); + for ingredient in &self.ingredients_requiring_reset { + self.ingredients_vec[ingredient.as_u32() as usize] + .reset_for_new_revision(self.runtime.table_mut()); } new_revision @@ -455,11 +450,8 @@ impl Zalsa { #[doc(hidden)] pub fn evict_lru(&mut self) { let _span = crate::tracing::debug_span!("evict_lru").entered(); - for (_, index) in self.ingredients_requiring_reset.iter() { - let index = index.as_u32() as usize; - self.ingredients_vec - .get_mut(index) - .unwrap_or_else(|| panic!("index `{index}` is uninitialized")) + for ingredient in &self.ingredients_requiring_reset { + self.ingredients_vec[ingredient.as_u32() as usize] .reset_for_new_revision(self.runtime.table_mut()); } }