update deps

Author: alexpyattaev

.github/workflows/rust.yml

@@ -2,9 +2,9 @@ name: Rust
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "main" ]
   pull_request:
-    branches: [ "master" ]
+    branches: [ "main" ]
 
 env:
   CARGO_TERM_COLOR: always

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "spatialtree"
 description = "A fast and flexible generic spatial tree collection (Octree, Quadtree, etc)"
-version = "0.1.2"
+version = "0.1.3"
 edition = "2021"
 license = "GPL-3.0"
 repository = "https://github.com/alexpyattaev/spatialtree"
@@ -13,21 +13,21 @@ exclude = [".github/"]
 
 [dependencies]
 arrayvec = "0.7"
-duplicate = "1.0"
+duplicate = "2.0"
 slab = "0.4"
-rand = { version = "0.8", features = ['small_rng'], optional = true }
+rand = { version = "0.9", features = ['small_rng'], optional = true }
 
 [features]
 default = ["rand"]
 rand = ["dep:rand"]
 
 [dev-dependencies]
 freelist = "0.1"
-lru = "0.10.0"
+lru = "0.13.0"
 rayon = "1.5"
 glium = "0.30"
 rand_derive = "0.5.0"
-criterion = { version = "0.4.0", features = ['html_reports'] }
+criterion = { version = "0.5.1", features = ['html_reports'] }
 
 [[bench]]
 name = "iterators"

src/coords.rs

@@ -262,15 +262,13 @@ where
         // minimum corner of the bounding box
         let min = node.pos.iter().map(|e| {
             let x = e.tousize();
-            (x << (level_difference + 1))
-                .saturating_sub(bb_size - offset)
+            (x << (level_difference + 1)).saturating_sub(bb_size - offset)
         });
 
         // maximum corner of the bounding box
         let max = node.pos.iter().map(|e| {
             let x = e.tousize();
-            (x << (level_difference + 1))
-                .saturating_add(bb_size + offset)
+            (x << (level_difference + 1)).saturating_add(bb_size + offset)
         });
 
         // iterator over bounding boxes
@@ -376,13 +374,13 @@ pub fn rand_cv<const N: usize, R: rand::Rng, T>(
     max: CoordVec<N, T>,
 ) -> CoordVec<N, T>
 where
-    T: ReasonableIntegerLike + rand::distributions::uniform::SampleUniform,
+    T: ReasonableIntegerLike + rand::distr::uniform::SampleUniform,
 {
     debug_assert_eq!(min.depth, max.depth);
     let mut zz = [T::fromusize(0); N];
     #[allow(clippy::needless_range_loop)]
     for i in 0..N {
-        zz[i] = rng.gen_range(min.pos[i]..max.pos[i]);
+        zz[i] = rng.random_range(min.pos[i]..max.pos[i]);
     }
     CoordVec::new(zz, min.depth)
 }

src/iter.rs

@@ -107,7 +107,6 @@ where
             pos: L::root(),
         });
 
-
         ChunkIdxInAABBIter {
             to_visit,
             to_return: arrayvec::ArrayVec::new(),
@@ -116,7 +115,7 @@ where
             bound_min,
             bound_max,
             #[cfg(test)]
-            max_stack:1
+            max_stack: 1,
         }
     }
     #[inline]
@@ -125,7 +124,7 @@ where
     }
 }
 
-impl<'a, const N: usize, const B: usize, L> Iterator for ChunkIdxInAABBIter<'a, N, B, L>
+impl<const N: usize, const B: usize, L> Iterator for ChunkIdxInAABBIter<'_, N, B, L>
 where
     L: LodVec<N>,
 {
@@ -250,8 +249,6 @@ pub fn iter_all_positions_in_bounds<const N: usize, L: LodVec<N>>(
     ite
 }
 
-
-
 impl<'a, const N: usize, const B: usize, C, L> Tree<N, B, C, L>
 where
     C: Sized,
@@ -264,7 +261,7 @@ where
         &'a self,
         bound_min: L,
         bound_max: L,
-    ) -> ChunkIdxInAABBIter<N, B, L> {
+    ) -> ChunkIdxInAABBIter<'a, N, B, L> {
         ChunkIdxInAABBIter::new(&self.nodes, bound_min, bound_max)
     }
 
@@ -274,10 +271,10 @@ where
         &'a self,
         bound_min: L,
         bound_max: L,
-    ) -> ChunksInAABBIter<N, B, C, L> {
+    ) -> ChunksInAABBIter<'a, N, B, C, L> {
         ChunksInAABBIter {
             chunks: &self.chunks,
-             chunk_idx_iter: ChunkIdxInAABBIter::new(&self.nodes, bound_min, bound_max),
+            chunk_idx_iter: ChunkIdxInAABBIter::new(&self.nodes, bound_min, bound_max),
         }
     }
     /// Iterate over mutable references to all chunks of the tree in the bounding box. Also returns chunk positions.
@@ -286,7 +283,7 @@ where
         &'a mut self,
         bound_min: L,
         bound_max: L,
-    ) -> ChunksInAABBIterMut<N, B, C, L> {
+    ) -> ChunksInAABBIterMut<'a, N, B, C, L> {
         ChunksInAABBIterMut {
             chunks: &mut self.chunks,
             chunk_idx_iter: ChunkIdxInAABBIter::new(&self.nodes, bound_min, bound_max),
@@ -312,7 +309,7 @@ mod tests {
         let mut rng = SmallRng::seed_from_u64(42);
 
         for _i in 0..NUM_QUERIES {
-            let depth = rng.gen_range(4u8..8u8);
+            let depth = rng.random_range(4u8..8u8);
             let cmax = 1 << depth;
             let min = rand_cv(
                 &mut rng,
@@ -346,7 +343,7 @@ mod tests {
         let mut rng = SmallRng::seed_from_u64(42);
 
         for _i in 0..NUM_QUERIES {
-            let depth = rng.gen_range(4u8..8u8);
+            let depth = rng.random_range(4u8..8u8);
             let cmax = 1 << depth;
             let min = rand_cv(
                 &mut rng,
@@ -388,7 +385,6 @@ mod tests {
             let expected_maxstack = ChunkIdxInAABBIter::<3, 8, OctVec>::stack_size(min);
 
             assert_eq!(ite.chunk_idx_iter.max_stack, expected_maxstack);
-
         }
 
         println!("Testing QuadTree");
@@ -407,7 +403,6 @@ mod tests {
 
             assert_eq!(ite.chunk_idx_iter.max_stack, expected_maxstack);
         }
-
     }
     #[test]
     fn iterate_over_chunks_in_aabb() {