Merge pull request #558 from evenfurther/usize-max

chore: replace usize::max_value() by usize::MAX
evenfurther · May 3, 2024 · 5813a36 · 5813a36
2 parents b695b57 + 838504f
commit 5813a36
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 14 deletions.
diff --git a/benches/algos.rs b/benches/algos.rs
@@ -7,7 +7,6 @@ use rand::prelude::SliceRandom;
 use rand::{Rng, RngCore, SeedableRng};
 use rand_xorshift::XorShiftRng;
 use std::collections::HashSet;
-use std::usize;
 
 #[derive(Clone, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
 struct Pt {

diff --git a/src/directed/astar.rs b/src/directed/astar.rs
@@ -7,7 +7,6 @@ use std::cmp::Ordering;
 use std::collections::{BinaryHeap, HashSet};
 use std::hash::Hash;
 use std::iter::FusedIterator;
-use std::usize;
 
 use super::reverse_path;
 use crate::FxIndexMap;
@@ -100,7 +99,7 @@ where
         index: 0,
     });
     let mut parents: FxIndexMap<N, (usize, C)> = FxIndexMap::default();
-    parents.insert(start.clone(), (usize::max_value(), Zero::zero()));
+    parents.insert(start.clone(), (usize::MAX, Zero::zero()));
     while let Some(SmallestCostHolder { cost, index, .. }) = to_see.pop() {
         let successors = {
             let (node, &(_, c)) = parents.get_index(index).unwrap(); // Cannot fail

diff --git a/src/directed/bfs.rs b/src/directed/bfs.rs
@@ -6,7 +6,6 @@ use crate::{FxIndexMap, FxIndexSet};
 use indexmap::map::Entry::Vacant;
 use std::hash::Hash;
 use std::iter::FusedIterator;
-use std::usize;
 
 /// Compute a shortest path using the [breadth-first search
 /// algorithm](https://en.wikipedia.org/wiki/Breadth-first_search).
@@ -90,7 +89,7 @@ where
     }
     let mut i = 0;
     let mut parents: FxIndexMap<N, usize> = FxIndexMap::default();
-    parents.insert(start.clone(), usize::max_value());
+    parents.insert(start.clone(), usize::MAX);
     while let Some((node, _)) = parents.get_index(i) {
         for successor in successors(node) {
             if success(&successor) {

diff --git a/src/directed/dijkstra.rs b/src/directed/dijkstra.rs
@@ -9,7 +9,6 @@ use rustc_hash::{FxHashMap, FxHashSet};
 use std::cmp::Ordering;
 use std::collections::{BinaryHeap, HashMap};
 use std::hash::Hash;
-use std::usize;
 
 /// Compute a shortest path using the [Dijkstra search
 /// algorithm](https://en.wikipedia.org/wiki/Dijkstra's_algorithm).
@@ -211,7 +210,7 @@ where
         index: 0,
     });
     let mut parents: FxIndexMap<N, (usize, C)> = FxIndexMap::default();
-    parents.insert(start.clone(), (usize::max_value(), Zero::zero()));
+    parents.insert(start.clone(), (usize::MAX, Zero::zero()));
     let mut target_reached = None;
     while let Some(SmallestHolder { cost, index }) = to_see.pop() {
         let successors = {
@@ -416,7 +415,7 @@ where
     });
 
     let mut parents: FxIndexMap<N, (usize, C)> = FxIndexMap::default();
-    parents.insert(start.clone(), (usize::max_value(), Zero::zero()));
+    parents.insert(start.clone(), (usize::MAX, Zero::zero()));
 
     let mut total_costs = FxHashMap::default();
     total_costs.insert(start.clone(), Zero::zero());

diff --git a/src/directed/fringe.rs b/src/directed/fringe.rs
@@ -8,7 +8,6 @@ use num_traits::{Bounded, Zero};
 use std::collections::VecDeque;
 use std::hash::Hash;
 use std::mem;
-use std::usize;
 
 /// Compute a shortest path using the [Fringe search
 /// algorithm](https://en.wikipedia.org/wiki/Fringe_search).
@@ -98,7 +97,7 @@ where
     let mut parents: FxIndexMap<N, (usize, C)> = FxIndexMap::default();
     let mut flimit = heuristic(start);
     now.push_back(0);
-    parents.insert(start.clone(), (usize::max_value(), Zero::zero()));
+    parents.insert(start.clone(), (usize::MAX, Zero::zero()));
 
     loop {
         if now.is_empty() {

diff --git a/src/undirected/connected_components.rs b/src/undirected/connected_components.rs
@@ -4,7 +4,6 @@ use std::collections::hash_map::Entry::{Occupied, Vacant};
 use std::collections::{HashMap, HashSet};
 use std::hash::Hash;
 use std::iter::once;
-use std::usize;
 
 fn join(table: &mut [usize], mut rx: usize, mut ry: usize) -> usize {
     while table[rx] != table[ry] {
@@ -66,7 +65,7 @@ where
     let mut indices = HashMap::new();
     for (mut group_index, group) in groups.iter().enumerate() {
         if group.is_empty() {
-            table[group_index] = usize::max_value();
+            table[group_index] = usize::MAX;
         }
         for element in group {
             match indices.entry(element) {
@@ -108,7 +107,7 @@ where
     let mut gb = gindices
         .into_iter()
         .enumerate()
-        .filter(|&(_, n)| n != usize::max_value())
+        .filter(|&(_, n)| n != usize::MAX)
         .collect::<Vec<_>>();
     gb.sort_unstable_by(|&(_, n1), &(_, n2)| Ord::cmp(&n1, &n2));
     let mut key = None;

diff --git a/tests/connected-components.rs b/tests/connected-components.rs
@@ -3,7 +3,6 @@ use pathfinding::undirected::connected_components::*;
 use rand::prelude::*;
 use rand_xorshift::XorShiftRng;
 use std::collections::HashSet;
-use std::usize;
 
 #[test]
 fn basic_separate_components() {