Ahash bump - follow up of #46 (#47)

* bump ahash crate to fix build currently, cargo build generates the following error due to the removal of stdsim: rust-lang/rust#117372 * fix clippy errors * attempt to fix formatting * attempt to not parallelize he intersection * remove rayon prelude * chore(cargo): update dependencies and modernize crate * chore(cargo): update lock via cargo update --------- Co-authored-by: Clément Michaud <clement.michaud34@gmail.com>
yamafaktory · Nov 19, 2024 · be27586 · be27586
1 parent e8be7ca
commit be27586
Show file tree

Hide file tree

Showing 55 changed files with 599 additions and 395 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,15 +13,26 @@ rust-version = "1.56"
 version = "2.1.2"
 
 [dependencies]
-ahash = "0.8.3"
-indexmap = { version = "2.0.0", features = ["rayon"] }
-itertools = "0.11.0"
+ahash = "0.8.11"
+indexmap = { version = "2.6.0", features = ["rayon"] }
+itertools = "0.13.0"
 rayon = "1.7.0"
-thiserror = "1.0.47"
+thiserror = "2.0.3"
 
 [dev-dependencies]
 criterion = "0.5.1"
 
 [[bench]]
 name = "performance"
 harness = false
+
+[lints.rust]
+missing_debug_implementations = "warn"
+missing_docs = "warn"
+nonstandard_style = { level = "deny", priority= -1 }
+rust_2021_compatibility = { level = "forbid", priority= -1 }
+unreachable_pub = "warn"
+unsafe_code = "deny"
+
+[lints.clippy]
+all = "deny"
diff --git a/benches/performance.rs b/benches/performance.rs
@@ -1,9 +1,21 @@
 #![deny(unsafe_code, nonstandard_style)]
 
-use std::fmt::{Display, Formatter, Result};
-
-use criterion::{criterion_group, criterion_main, Criterion};
-use hypergraph::{HyperedgeIndex, Hypergraph, VertexIndex};
+use std::fmt::{
+    Display,
+    Formatter,
+    Result,
+};
+
+use criterion::{
+    Criterion,
+    criterion_group,
+    criterion_main,
+};
+use hypergraph::{
+    HyperedgeIndex,
+    Hypergraph,
+    VertexIndex,
+};
 use itertools::Itertools;
 
 static HYPEREDGES: usize = 10_000;

diff --git a/rustfmt.toml b/rustfmt.toml
@@ -1,5 +1,6 @@
 edition = "2021"
 group_imports = "StdExternalCrate"
 imports_granularity = "Crate"
+imports_layout="Vertical"
 use_field_init_shorthand = true
-version = "Two"
+style_edition = "2024"
diff --git a/src/core/bi_hash_map.rs b/src/core/bi_hash_map.rs
@@ -1,4 +1,7 @@
-use std::{collections::HashMap, fmt::Debug};
+use std::{
+    collections::HashMap,
+    fmt::Debug,
+};
 
 /// Bi-directional hashmap used to store the mapping between the internal
 /// unstable indexes - generated by `IndexMap` and `IndexSet` - and the exposed

diff --git a/src/core/errors.rs b/src/core/errors.rs
@@ -1,6 +1,9 @@
 use thiserror::Error;
 
-use crate::{HyperedgeIndex, VertexIndex};
+use crate::{
+    HyperedgeIndex,
+    VertexIndex,
+};
 
 /// Enumeration of all the possible errors.
 #[derive(Clone, Debug, Eq, Error, PartialEq)]
@@ -9,7 +12,7 @@ where
     V: Copy + Eq,
     HE: Copy + Eq,
 {
-    /// Error when a HyperedgeIndex was not found.
+    /// Error when a `HyperedgeIndex` was not found.
     #[error("HyperedgeIndex {0} was not found")]
     HyperedgeIndexNotFound(HyperedgeIndex),
 
@@ -66,7 +69,7 @@ where
     #[error("At least two hyperedges must be provided to be joined")]
     HyperedgesInvalidJoin,
 
-    /// Error when a VertexIndex was not found.
+    /// Error when a `VertexIndex` was not found.
     #[error("VertexIndex {0} was not found")]
     VertexIndexNotFound(VertexIndex),
 

diff --git a/src/core/hyperedges/add_hyperedge.rs b/src/core/hyperedges/add_hyperedge.rs
@@ -1,6 +1,11 @@
 use crate::{
-    errors::HypergraphError, HyperedgeIndex, HyperedgeKey, HyperedgeTrait, Hypergraph, VertexIndex,
+    HyperedgeIndex,
+    HyperedgeKey,
+    HyperedgeTrait,
+    Hypergraph,
+    VertexIndex,
     VertexTrait,
+    errors::HypergraphError,
 };
 
 impl<V, HE> Hypergraph<V, HE>

diff --git a/src/core/hyperedges/add_hyperedge_index.rs b/src/core/hyperedges/add_hyperedge_index.rs
@@ -1,4 +1,9 @@
-use crate::{HyperedgeIndex, HyperedgeTrait, Hypergraph, VertexTrait};
+use crate::{
+    HyperedgeIndex,
+    HyperedgeTrait,
+    Hypergraph,
+    VertexTrait,
+};
 
 impl<V, HE> Hypergraph<V, HE>
 where

diff --git a/src/core/hyperedges/clear_hyperedges.rs b/src/core/hyperedges/clear_hyperedges.rs
@@ -1,7 +1,11 @@
 use rayon::prelude::*;
 
 use crate::{
-    bi_hash_map::BiHashMap, errors::HypergraphError, HyperedgeTrait, Hypergraph, VertexTrait,
+    HyperedgeTrait,
+    Hypergraph,
+    VertexTrait,
+    bi_hash_map::BiHashMap,
+    errors::HypergraphError,
 };
 
 impl<V, HE> Hypergraph<V, HE>

diff --git a/src/core/hyperedges/contract_hyperedge_vertices.rs b/src/core/hyperedges/contract_hyperedge_vertices.rs
@@ -2,8 +2,13 @@ use itertools::Itertools;
 use rayon::prelude::*;
 
 use crate::{
-    core::utils::are_slices_equal, errors::HypergraphError, HyperedgeIndex, HyperedgeTrait,
-    Hypergraph, VertexIndex, VertexTrait,
+    HyperedgeIndex,
+    HyperedgeTrait,
+    Hypergraph,
+    VertexIndex,
+    VertexTrait,
+    core::utils::are_slices_equal,
+    errors::HypergraphError,
 };
 
 impl<V, HE> Hypergraph<V, HE>

diff --git a/src/core/hyperedges/count_hyperedges.rs b/src/core/hyperedges/count_hyperedges.rs
@@ -1,4 +1,8 @@
-use crate::{HyperedgeTrait, Hypergraph, VertexTrait};
+use crate::{
+    HyperedgeTrait,
+    Hypergraph,
+    VertexTrait,
+};
 
 impl<V, HE> Hypergraph<V, HE>
 where

diff --git a/src/core/hyperedges/get_hyperedge.rs b/src/core/hyperedges/get_hyperedge.rs
@@ -1,4 +1,10 @@
-use crate::{errors::HypergraphError, HyperedgeIndex, HyperedgeTrait, Hypergraph, VertexTrait};
+use crate::{
+    HyperedgeIndex,
+    HyperedgeTrait,
+    Hypergraph,
+    VertexTrait,
+    errors::HypergraphError,
+};
 
 impl<V, HE> Hypergraph<V, HE>
 where

diff --git a/src/core/hyperedges/get_hyperedge_vertices.rs b/src/core/hyperedges/get_hyperedge_vertices.rs
@@ -1,6 +1,11 @@
 use crate::{
-    errors::HypergraphError, HyperedgeIndex, HyperedgeKey, HyperedgeTrait, Hypergraph, VertexIndex,
+    HyperedgeIndex,
+    HyperedgeKey,
+    HyperedgeTrait,
+    Hypergraph,
+    VertexIndex,
     VertexTrait,
+    errors::HypergraphError,
 };
 
 impl<V, HE> Hypergraph<V, HE>

diff --git a/src/core/hyperedges/get_hyperedge_weight.rs b/src/core/hyperedges/get_hyperedge_weight.rs
@@ -1,4 +1,10 @@
-use crate::{errors::HypergraphError, HyperedgeIndex, HyperedgeTrait, Hypergraph, VertexTrait};
+use crate::{
+    HyperedgeIndex,
+    HyperedgeTrait,
+    Hypergraph,
+    VertexTrait,
+    errors::HypergraphError,
+};
 
 impl<V, HE> Hypergraph<V, HE>
 where

diff --git a/src/core/hyperedges/get_hyperedges.rs b/src/core/hyperedges/get_hyperedges.rs
@@ -1,6 +1,12 @@
 use rayon::prelude::*;
 
-use crate::{errors::HypergraphError, HyperedgeIndex, HyperedgeTrait, Hypergraph, VertexTrait};
+use crate::{
+    HyperedgeIndex,
+    HyperedgeTrait,
+    Hypergraph,
+    VertexTrait,
+    errors::HypergraphError,
+};
 
 impl<V, HE> Hypergraph<V, HE>
 where

diff --git a/src/core/hyperedges/get_hyperedges_connecting.rs b/src/core/hyperedges/get_hyperedges_connecting.rs
@@ -1,8 +1,13 @@
 use rayon::prelude::*;
 
 use crate::{
-    core::shared::Connection, errors::HypergraphError, HyperedgeIndex, HyperedgeTrait, Hypergraph,
-    VertexIndex, VertexTrait,
+    HyperedgeIndex,
+    HyperedgeTrait,
+    Hypergraph,
+    VertexIndex,
+    VertexTrait,
+    core::shared::Connection,
+    errors::HypergraphError,
 };
 
 impl<V, HE> Hypergraph<V, HE>

diff --git a/src/core/hyperedges/get_hyperedges_intersections.rs b/src/core/hyperedges/get_hyperedges_intersections.rs
@@ -1,9 +1,13 @@
 use itertools::Itertools;
-use rayon::prelude::*;
 
 use crate::{
-    errors::HypergraphError, HyperedgeIndex, HyperedgeKey, HyperedgeTrait, Hypergraph, VertexIndex,
+    HyperedgeIndex,
+    HyperedgeKey,
+    HyperedgeTrait,
+    Hypergraph,
+    VertexIndex,
     VertexTrait,
+    errors::HypergraphError,
 };
 
 impl<V, HE> Hypergraph<V, HE>
@@ -26,7 +30,7 @@ where
 
         // Get the internal vertices of the hyperedges and keep the eventual error.
         let vertices = hyperedges
-            .into_par_iter()
+            .into_iter()
             .map(|hyperedge_index| {
                 self.get_internal_hyperedge(hyperedge_index)
                     .and_then(|internal_index| {

diff --git a/src/core/hyperedges/get_internal_hyperedge.rs b/src/core/hyperedges/get_internal_hyperedge.rs
@@ -1,4 +1,10 @@
-use crate::{errors::HypergraphError, HyperedgeIndex, HyperedgeTrait, Hypergraph, VertexTrait};
+use crate::{
+    HyperedgeIndex,
+    HyperedgeTrait,
+    Hypergraph,
+    VertexTrait,
+    errors::HypergraphError,
+};
 
 impl<V, HE> Hypergraph<V, HE>
 where

diff --git a/src/core/hyperedges/get_internal_hyperedges.rs b/src/core/hyperedges/get_internal_hyperedges.rs
@@ -1,4 +1,10 @@
-use crate::{errors::HypergraphError, HyperedgeIndex, HyperedgeTrait, Hypergraph, VertexTrait};
+use crate::{
+    HyperedgeIndex,
+    HyperedgeTrait,
+    Hypergraph,
+    VertexTrait,
+    errors::HypergraphError,
+};
 
 impl<V, HE> Hypergraph<V, HE>
 where

diff --git a/src/core/hyperedges/join_hyperedges.rs b/src/core/hyperedges/join_hyperedges.rs
@@ -1,7 +1,12 @@
 use rayon::prelude::*;
 
 use crate::{
-    errors::HypergraphError, HyperedgeIndex, HyperedgeTrait, Hypergraph, VertexIndex, VertexTrait,
+    HyperedgeIndex,
+    HyperedgeTrait,
+    Hypergraph,
+    VertexIndex,
+    VertexTrait,
+    errors::HypergraphError,
 };
 
 impl<V, HE> Hypergraph<V, HE>

diff --git a/src/core/hyperedges/remove_hyperedge.rs b/src/core/hyperedges/remove_hyperedge.rs
@@ -1,5 +1,10 @@
 use crate::{
-    errors::HypergraphError, HyperedgeIndex, HyperedgeKey, HyperedgeTrait, Hypergraph, VertexTrait,
+    HyperedgeIndex,
+    HyperedgeKey,
+    HyperedgeTrait,
+    Hypergraph,
+    VertexTrait,
+    errors::HypergraphError,
 };
 
 impl<V, HE> Hypergraph<V, HE>
@@ -33,7 +38,7 @@ where
         for vertex in vertices {
             match self.vertices.get_index_mut(vertex) {
                 Some((_, index_set)) => {
-                    index_set.remove(&internal_index);
+                    index_set.swap_remove(&internal_index);
                 }
                 None => return Err(HypergraphError::InternalVertexIndexNotFound(vertex)),
             }
@@ -113,7 +118,7 @@ where
                         // Perform an insertion of the current hyperedge and a
                         // removal of the swapped one.
                         index_set.insert(internal_index);
-                        index_set.remove(&last_index);
+                        index_set.swap_remove(&last_index);
                     }
                     None => return Err(HypergraphError::InternalVertexIndexNotFound(vertex)),
                 }

diff --git a/src/core/hyperedges/reverse_hyperedge.rs b/src/core/hyperedges/reverse_hyperedge.rs
@@ -1,6 +1,12 @@
 use rayon::prelude::*;
 
-use crate::{errors::HypergraphError, HyperedgeIndex, HyperedgeTrait, Hypergraph, VertexTrait};
+use crate::{
+    HyperedgeIndex,
+    HyperedgeTrait,
+    Hypergraph,
+    VertexTrait,
+    errors::HypergraphError,
+};
 
 impl<V, HE> Hypergraph<V, HE>
 where

diff --git a/src/core/hyperedges/update_hyperedge_vertices.rs b/src/core/hyperedges/update_hyperedge_vertices.rs
@@ -1,8 +1,14 @@
 use rayon::prelude::*;
 
 use crate::{
-    core::utils::are_slices_equal, errors::HypergraphError, HyperedgeIndex, HyperedgeKey,
-    HyperedgeTrait, Hypergraph, VertexIndex, VertexTrait,
+    HyperedgeIndex,
+    HyperedgeKey,
+    HyperedgeTrait,
+    Hypergraph,
+    VertexIndex,
+    VertexTrait,
+    core::utils::are_slices_equal,
+    errors::HypergraphError,
 };
 
 impl<V, HE> Hypergraph<V, HE>

diff --git a/src/core/hyperedges/update_hyperedge_weight.rs b/src/core/hyperedges/update_hyperedge_weight.rs
@@ -1,5 +1,10 @@
 use crate::{
-    errors::HypergraphError, HyperedgeIndex, HyperedgeKey, HyperedgeTrait, Hypergraph, VertexTrait,
+    HyperedgeIndex,
+    HyperedgeKey,
+    HyperedgeTrait,
+    Hypergraph,
+    VertexTrait,
+    errors::HypergraphError,
 };
 
 impl<V, HE> Hypergraph<V, HE>

diff --git a/src/core/indexes.rs b/src/core/indexes.rs
@@ -1,4 +1,8 @@
-use std::fmt::{Display, Formatter, Result};
+use std::fmt::{
+    Display,
+    Formatter,
+    Result,
+};
 
 /// Vertex stable index representation as usize.
 /// Uses the newtype index pattern.

diff --git a/src/core/iterator.rs b/src/core/iterator.rs
@@ -1,6 +1,12 @@
 use rayon::prelude::*;
 
-use crate::{errors::HypergraphError, HyperedgeKey, HyperedgeTrait, Hypergraph, VertexTrait};
+use crate::{
+    HyperedgeKey,
+    HyperedgeTrait,
+    Hypergraph,
+    VertexTrait,
+    errors::HypergraphError,
+};
 
 impl<V, HE> IntoIterator for Hypergraph<V, HE>
 where