deduplicate Index fns

Author: lengyijun

src/double_priority_queue/mod.rs

@@ -35,6 +35,7 @@ pub mod iterators;
 use std::vec::Vec;
 
 use crate::core_iterators::*;
+use crate::store::{left, level, log2_fast, parent, right};
 use crate::store::{Index, Position, Store};
 use crate::TryReserveError;
 use iterators::*;
@@ -1218,33 +1219,6 @@ where
     }
 }
 
-/// Compute the index of the left child of an item from its index
-#[inline(always)]
-const fn left(i: Position) -> Position {
-    Position((i.0 * 2) + 1)
-}
-/// Compute the index of the right child of an item from its index
-#[inline(always)]
-const fn right(i: Position) -> Position {
-    Position((i.0 * 2) + 2)
-}
-/// Compute the index of the parent element in the heap from its index
-#[inline(always)]
-const fn parent(i: Position) -> Position {
-    Position((i.0 - 1) / 2)
-}
-
-// Compute the level of a node from its index
-#[inline(always)]
-const fn level(i: Position) -> usize {
-    log2_fast(i.0 + 1)
-}
-
-#[inline(always)]
-const fn log2_fast(x: usize) -> usize {
-    (usize::BITS - x.leading_zeros() - 1) as usize
-}
-
 // `rebuild` takes O(len1 + len2) operations
 // and about 2 * (len1 + len2) comparisons in the worst case
 // while `extend` takes O(len2 * log_2(len1)) operations

src/priority_queue/mod.rs

@@ -36,6 +36,7 @@ pub mod iterators;
 use std::vec::Vec;
 
 use crate::core_iterators::*;
+use crate::store::{left, log2_fast, parent, right};
 use crate::store::{Index, Position, Store};
 use crate::TryReserveError;
 use iterators::*;
@@ -977,27 +978,6 @@ where
     }
 }
 
-/// Compute the index of the left child of an item from its index
-#[inline(always)]
-const fn left(i: Position) -> Position {
-    Position((i.0 * 2) + 1)
-}
-/// Compute the index of the right child of an item from its index
-#[inline(always)]
-const fn right(i: Position) -> Position {
-    Position((i.0 * 2) + 2)
-}
-/// Compute the index of the parent element in the heap from its index
-#[inline(always)]
-const fn parent(i: Position) -> Position {
-    Position((i.0 - 1) / 2)
-}
-
-#[inline(always)]
-const fn log2_fast(x: usize) -> usize {
-    (usize::BITS - x.leading_zeros() - 1) as usize
-}
-
 // `rebuild` takes O(len1 + len2) operations
 // and about 2 * (len1 + len2) comparisons in the worst case
 // while `extend` takes O(len2 * log_2(len1)) operations

src/store.rs

@@ -46,10 +46,38 @@ use indexmap::map::{IndexMap, MutableKeys};
 /// The Index of the element in the Map
 #[derive(Copy, Clone, Debug, Ord, PartialOrd, Eq, PartialEq)]
 pub(crate) struct Index(pub usize);
+
 /// The Position of the element in the Heap
 #[derive(Copy, Clone, Debug, Ord, PartialOrd, Eq, PartialEq)]
 pub(crate) struct Position(pub usize);
 
+/// Compute the index of the left child of an item from its index
+#[inline(always)]
+pub(crate) const fn left(i: Position) -> Position {
+    Position((i.0 * 2) + 1)
+}
+/// Compute the index of the right child of an item from its index
+#[inline(always)]
+pub(crate) const fn right(i: Position) -> Position {
+    Position((i.0 * 2) + 2)
+}
+/// Compute the index of the parent element in the heap from its index
+#[inline(always)]
+pub(crate) const fn parent(i: Position) -> Position {
+    Position((i.0 - 1) / 2)
+}
+
+// Compute the level of a node from its index
+#[inline(always)]
+pub(crate) const fn level(i: Position) -> usize {
+    log2_fast(i.0 + 1)
+}
+
+#[inline(always)]
+pub(crate) const fn log2_fast(x: usize) -> usize {
+    (usize::BITS - x.leading_zeros() - 1) as usize
+}
+
 /// Internal storage of PriorityQueue and DoublePriorityQueue
 #[derive(Clone)]
 #[cfg(feature = "std")]