Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ repository = "https://github.com/sile/splay_tree"
readme = "README.md"
categories = ["data-structures", "no-std"]
license = "MIT"
edition = "2021"
edition = "2024"

[dependencies]
serde = { version = "1", optional = true, default-features = false, features = ["alloc", "derive"] }

[dev-dependencies]
rand = "0.8"
rand = "0.9"
serde_json = { version = "1" }

[features]
Expand Down
2 changes: 1 addition & 1 deletion src/tree_core.rs
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ impl<K, V> Tree<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> {
&mut *(self.node_mut(i) as *mut _)
unsafe { &mut *(self.node_mut(i) as *mut _) }
}
pub fn len(&self) -> usize {
self.nodes.len()
Expand Down
16 changes: 8 additions & 8 deletions tests/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ mod map {

// large map
let mut input = (0..1000).into_iter().collect::<Vec<_>>();
input.shuffle(&mut rand::thread_rng());
input.shuffle(&mut rand::rng());

let mut map: SplayMap<_, _> = input.into_iter().map(|n| (n, n)).collect();
assert_eq!(map.find_lower_bound_key(&500), Some(&500));
Expand Down Expand Up @@ -155,7 +155,7 @@ mod map {
#[test]
fn large_map() {
let mut input = (0..1000).into_iter().collect::<Vec<_>>();
input.shuffle(&mut rand::thread_rng());
input.shuffle(&mut rand::rng());

let mut map: SplayMap<_, _> = input.into_iter().map(|n| (n, n)).collect();
for i in 0..1000 {
Expand All @@ -168,7 +168,7 @@ mod map {
#[test]
fn map_serde() {
let mut input = (0..1000).into_iter().collect::<Vec<_>>();
input.shuffle(&mut rand::thread_rng());
input.shuffle(&mut rand::rng());

let map: SplayMap<_, _> = input.into_iter().map(|n| (n, n)).collect();
let ser_map: SplayMap<_, _> = from_str(&to_string(&map).unwrap()).unwrap();
Expand Down Expand Up @@ -253,7 +253,7 @@ mod set {

// large set
let mut input = (0..1000).into_iter().collect::<Vec<_>>();
input.shuffle(&mut rand::thread_rng());
input.shuffle(&mut rand::rng());

let mut set: SplaySet<_> = input.into_iter().collect();
assert_eq!(set.find_lower_bound(&500), Some(&500));
Expand Down Expand Up @@ -306,7 +306,7 @@ mod set {
#[test]
fn large_set() {
let mut input = (0..1000).collect::<Vec<_>>();
input.shuffle(&mut rand::thread_rng());
input.shuffle(&mut rand::rng());

let mut set: SplaySet<_> = input.iter().cloned().collect();
for i in input {
Expand Down Expand Up @@ -383,7 +383,7 @@ mod set {
#[test]
fn set_serde() {
let mut input = (0..1000).into_iter().collect::<Vec<_>>();
input.shuffle(&mut rand::thread_rng());
input.shuffle(&mut rand::rng());

let set: SplaySet<_> = input.into_iter().collect();
let ser_set: SplaySet<_> = from_str(&to_string(&set).unwrap()).unwrap();
Expand Down Expand Up @@ -461,7 +461,7 @@ mod heap {
#[test]
fn large_heap() {
let mut input = (0..1000).into_iter().collect::<Vec<_>>();
input.shuffle(&mut rand::thread_rng());
input.shuffle(&mut rand::rng());

let mut heap = input.into_iter().collect::<SplayHeap<_>>();
while let Some(n) = heap.pop() {
Expand All @@ -475,7 +475,7 @@ mod heap {
use std::iter::FromIterator;

let mut input = (0..1000).into_iter().collect::<Vec<_>>();
input.shuffle(&mut rand::thread_rng());
input.shuffle(&mut rand::rng());

let heap: SplayHeap<_> = input.into_iter().collect();
let ser_heap: SplayHeap<u64> = from_str(&to_string(&heap).unwrap()).unwrap();
Expand Down