Repository navigation
Add shift_remove family to IndexMap/IndexSet - #685
Merged
sgued merged 3 commits intoOct 6, 2026
Merged
Conversation
sgued
requested changes
Sep 26, 2026
sgued
left a comment
sgued
left a comment
Contributor
There was a problem hiding this comment.
Hi, sorry for the delayed review.
Regarding your additions, LGTM besides a couple of nitpicks.
Can I also ask you to also rename the remove_found function to swap_remove_found ?
That way it's clear in future refactors that remove_found might have unexpected behaviour.
Comment on lines
+746
to
+747
| /// preserving their relative order. | ||
| pub fn shift_remove_entry(self) -> (K, V) { |
Contributor
There was a problem hiding this comment.
Suggested change
| /// preserving their relative order. | |
| pub fn shift_remove_entry(self) -> (K, V) { | |
| /// preserving their relative order. | |
| /// | |
| /// Computes in **O(n)** time on average | |
| pub fn shift_remove_entry(self) -> (K, V) { |
| /// preserving their relative order. | ||
| pub fn shift_remove_entry(self) -> (K, V) { | ||
| // SAFETY: We know that `pos` is valid from the creation of the entry | ||
| // and that cannot have changed since we held a mutable entry to the map |
Contributor
There was a problem hiding this comment.
Suggested change
| // and that cannot have changed since we held a mutable entry to the map | |
| // and that cannot have changed since we held a mutable reference to the map |
Comment on lines
+809
to
+810
| /// preserving their relative order. | ||
| pub fn shift_remove(self) -> V { |
Contributor
There was a problem hiding this comment.
Suggested change
| /// preserving their relative order. | |
| pub fn shift_remove(self) -> V { | |
| /// preserving their relative order. | |
| /// | |
| /// Computes in **O(n)** time on average | |
| pub fn shift_remove(self) -> V { |
swap_remove is O(1) but perturbs the position of the last element, which isn't acceptable when callers need remaining entries to keep their relative insertion order after a removal. This mirrors the upstream indexmap crate's shift_remove/shift_remove_entry API (O(n), shifts entries down via Vec::remove and fixes up the hash table's index pointers) adapted to heapless's fixed-capacity, no_std CoreMap/Pos representation. Fixes rust-embedded#678
…n) shift_remove Signed-off-by: HarnageaGabriel <gabriel.harnagea06@gmail.com>
sgued
force-pushed
the
feat/shift-remove-indexmap
branch
from
October 6, 2026 19:08
7c2452f to
4a0db9e
Compare
sgued
approved these changes
Oct 6, 2026
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
2 participants
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.
Summary
swap_removeis O(1) but perturbs map/set order by moving the last element into the removed slot. This adds order-preserving removal, mirroring theindexmapcrate'sshift_removeAPI:IndexMap::shift_remove/shift_remove_entry/shift_remove_indexOccupiedEntry::shift_remove/shift_remove_entryIndexSet::shift_removeImplementation:
CoreMap::shift_remove_foundremoves the entry withVec::remove(order-preserving shift) instead ofswap_remove_unchecked, then walks theindicesrobin-hood table decrementing everyPoswhose index pointed past the removed slot, then runs the existingbackward_shift_after_removalto restore the probe-distance invariant. O(n) instead ofswap_remove's O(1), same as upstreamindexmap.remove/swap_remove/remove_entry/swap_remove_entryare untouched.Fixes #678
Test plan
cargo buildcargo test --lib(251 passed, including 5 newshift_removetests covering order preservation onIndexMap,OccupiedEntry,shift_remove_index, andIndexSet)cargo test --doc index_map(31 passed, including new doctests)cargo clippy --libclean (repo deniesclippy::undocumented_unsafe_blocks)cargo fmt --checkclean