Skip to content

Mark internal node_ref and node_mut as unsafe functions #10

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
sile merged 1 commit into from
Nov 1, 2025
Merged

Mark internal node_ref and node_mut as unsafe functions #10

Show file tree
Hide file tree
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
56 changes: 30 additions & 26 deletions src/tree_core.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ where
Q: ?Sized + Ord,
{
let mut index = self.root();
while let Some(node) = index.map(|i| self.node_ref(i)) {
while let Some(node) = index.map(|i| unsafe { self.node_ref(i) }) {
match key.cmp(node.key.borrow()) {
Ordering::Equal => return Some((&node.key, &node.val)),
Ordering::Less => index = node.lft(),
Expand All @@ -154,7 +154,7 @@ where
{
let mut index = self.root();
let mut candidate = None;
while let Some(node) = index.map(|i| self.node_ref(i)) {
while let Some(node) = index.map(|i| unsafe { self.node_ref(i) }) {
match cmp(&node.key) {
Ordering::Equal => return Some(&node.key),
Ordering::Less => {
Expand Down Expand Up @@ -223,12 +223,14 @@ where
})
}
pub fn get_lftmost_immut(&self) -> Option<(&K, &V)> {
self.root().map(|i| self.node_ref(i)).map(|mut node| {
while let Some(next) = node.lft().map(|i| self.node_ref(i)) {
node = next;
}
(&node.key, &node.val)
})
self.root()
.map(|i| unsafe { self.node_ref(i) })
.map(|mut node| {
while let Some(next) = node.lft().map(|i| unsafe { self.node_ref(i) }) {
node = next;
}
(&node.key, &node.val)
})
}
pub fn take_lftmost(&mut self) -> Option<(K, V)> {
self.root().map(|root| {
Expand All @@ -243,12 +245,14 @@ where
})
}
pub fn get_rgtmost_immut(&self) -> Option<(&K, &V)> {
self.root().map(|i| self.node_ref(i)).map(|mut node| {
while let Some(next) = node.rgt().map(|i| self.node_ref(i)) {
node = next;
}
(&node.key, &node.val)
})
self.root()
.map(|i| unsafe { self.node_ref(i) })
.map(|mut node| {
while let Some(next) = node.rgt().map(|i| unsafe { self.node_ref(i) }) {
node = next;
}
(&node.key, &node.val)
})
}
pub fn take_rgtmost(&mut self) -> Option<(K, V)> {
self.root().map(|root| {
Expand Down Expand Up @@ -355,23 +359,23 @@ where
rgt,
..
} => rgt,
Node { lft, rgt, .. } if self.node_ref(rgt).lft == NULL_NODE => {
self.node_mut(rgt).lft = lft;
Node { lft, rgt, .. } if unsafe { self.node_ref(rgt).lft } == NULL_NODE => {
unsafe { self.node_mut(rgt).lft = lft };
rgt
}
Node { lft, mut rgt, .. } => {
let lft_rgt = mem::replace(&mut self.node_mut(lft).rgt, NULL_NODE);
let lft_rgt = mem::replace(&mut unsafe { self.node_mut(lft).rgt }, NULL_NODE);
if lft_rgt != NULL_NODE {
rgt = self.splay_lftmost(rgt);
self.node_mut(rgt).lft = lft_rgt;
unsafe { self.node_mut(rgt).lft = lft_rgt };
}
self.node_mut(lft).rgt = rgt;
unsafe { self.node_mut(lft).rgt = rgt };
lft
}
};
if self.len() as NodeIndex - 1 != self.root {
let key = &self.node_ref(self.len() as NodeIndex - 1).key as *const _;
let _ = self.splay(new_root, unsafe { &*key });
let key = unsafe { &*(&self.node_ref(self.len() as NodeIndex - 1).key as *const _) };
let _ = self.splay(new_root, key);
let last = self.nodes.pop().unwrap();
mem::replace(self.root_mut(), last).into()
} else {
Expand All @@ -391,7 +395,7 @@ where
if root_rgt != NULL_NODE {
root_rgt = self.splay_lftmost(root_rgt);
self.root_mut().rgt = root_rgt;
Some(&self.node_ref(root_rgt).key)
Some(&unsafe { self.node_ref(root_rgt) }.key)
} else {
None
}
Expand All @@ -411,16 +415,16 @@ impl<K, V> Tree<K, V> {
}
pub fn root_ref(&self) -> &Node<K, V> {
let root = self.root;
self.node_ref(root)
unsafe { self.node_ref(root) }
}
pub fn root_mut(&mut self) -> &mut Node<K, V> {
let root = self.root;
self.node_mut(root)
unsafe { self.node_mut(root) }
}
pub fn node_ref(&self, i: NodeIndex) -> &Node<K, V> {
pub unsafe fn node_ref(&self, i: NodeIndex) -> &Node<K, V> {
unsafe { self.nodes.get_unchecked(i as usize) }
}
pub fn node_mut(&mut self, i: NodeIndex) -> &mut Node<K, V> {
pub unsafe fn node_mut(&mut self, i: NodeIndex) -> &mut Node<K, V> {
unsafe { self.nodes.get_unchecked_mut(i as usize) }
}
unsafe fn aliasable_node_mut<'a>(&mut self, i: NodeIndex) -> &'a mut Node<K, V> {
Expand Down
6 changes: 3 additions & 3 deletions src/vec_like.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ impl<'a, K: 'a, V: 'a> VecLike<'a, K, V> {
}
pub fn get(&self, index: usize) -> Option<(&'a K, &'a V)> {
if index < self.tree.len() {
Some(self.tree.node_ref(index as tree_core::NodeIndex).into())
Some(unsafe { self.tree.node_ref(index as tree_core::NodeIndex).into() })
} else {
None
}
Expand Down Expand Up @@ -72,15 +72,15 @@ impl<'a, K: 'a, V: 'a> VecLikeMut<'a, K, V> {
}
pub fn get(&self, index: usize) -> Option<(&K, &V)> {
if index < self.tree.len() {
Some(self.tree.node_ref(index as tree_core::NodeIndex).into())
Some(unsafe { self.tree.node_ref(index as tree_core::NodeIndex).into() })
} else {
None
}
}
#[allow(dead_code)]
pub fn get_mut(&mut self, index: usize) -> Option<(&K, &mut V)> {
if index < self.tree.len() {
Some(self.tree.node_mut(index as tree_core::NodeIndex).into())
Some(unsafe { self.tree.node_mut(index as tree_core::NodeIndex).into() })
} else {
None
}
Expand Down