Skip to content

remove unsafe from iter_mut #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nicolaskagami merged 1 commit into from
Mar 11, 2026
Merged

remove unsafe from iter_mut #15

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions src/iter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ impl<P: Prefix, V> Poptrie<P, V> {
pub struct IterMut<'a, P: Prefix, V> {
entries: core::slice::Iter<'a, BTreeMap<PrefixId, Entry<P>>>,
current: btree_map::Iter<'a, PrefixId, Entry<P>>,
values: &'a mut [V],
values: Vec<Option<&'a mut V>>, // Could be 15% faster with unsafe
}

impl<'a, P: Prefix, V> Iterator for IterMut<'a, P, V> {
Expand All @@ -260,9 +260,7 @@ impl<'a, P: Prefix, V> Iterator for IterMut<'a, P, V> {
if let Some(idx) = value_index.get() {
// SAFETY: Each ValueIndex is unique across all entries so
// no two yielded references alias.
return Some((prefix, unsafe {
&mut *self.values.as_mut_ptr().add(idx)
}));
return Some((prefix, self.values[idx].take().unwrap()));
}
}
self.current = self.entries.next()?.iter();
Expand Down Expand Up @@ -297,7 +295,7 @@ impl<P: Prefix, V> Poptrie<P, V> {
IterMut {
entries: entries_iter,
current,
values: values.as_mut_slice(),
values: values.iter_mut().map(Some).collect(),
}
}
}
Expand Down
Loading