chore: clean and order imports (#283)

* update benches

* udpate core crate

* update kernel crate

* update render crate

benches/Cargo.toml

@@ -19,8 +19,8 @@ cfg-if.workspace = true
 honeycomb.workspace = true
 rayon.workspace = true
 
+
 [dev-dependencies]
-honeycomb-core.workspace = true
 criterion = { workspace = true, features = ["html_reports"] }
 iai-callgrind.workspace = true
 rand = { workspace = true, features = ["small_rng"] }

benches/benches/builder/grid_size.rs

@@ -1,10 +1,7 @@
-// ------ IMPORTS
-
 use criterion::{black_box, criterion_group, criterion_main, BenchmarkId, Criterion, Throughput};
-use honeycomb::prelude::CMap2;
+use honeycomb::prelude::{CMap2, CMapBuilder};
+
 use honeycomb_benches::FloatType;
-use honeycomb_core::cmap::CMapBuilder;
-// ------ CONTENT
 
 pub fn criterion_benchmark(c: &mut Criterion) {
     let mut group = c.benchmark_group("builder-grid-size");

benches/benches/builder/time.rs

@@ -1,10 +1,7 @@
-// ------ IMPORTS
-
 use criterion::{black_box, criterion_group, criterion_main, BenchmarkId, Criterion};
-use honeycomb::prelude::CMap2;
+use honeycomb::prelude::{CMap2, CMapBuilder};
+
 use honeycomb_benches::FloatType;
-use honeycomb_core::cmap::CMapBuilder;
-// ------ CONTENT
 
 pub fn criterion_benchmark(c: &mut Criterion) {
     // passing args to cargo bench filters bench instead of actually reading args;

benches/benches/core/cmap2/basic_ops.rs

@@ -9,20 +9,15 @@
 //!
 //! Each benchmark is repeated on CMap2 of different sizes.
 
-// ------ IMPORTS
-
 use std::hint::black_box;
 
-use honeycomb_core::cmap::{CMap2, CMapBuilder, DartIdType};
-use honeycomb_core::geometry::Vertex2;
+use honeycomb::prelude::{CMap2, CMapBuilder, DartIdType, Vertex2};
 use iai_callgrind::{
     library_benchmark, library_benchmark_group, main, FlamegraphConfig, LibraryBenchmarkConfig,
 };
 
 use honeycomb_benches::FloatType;
 
-// ------ CONTENT
-
 // --- common
 
 fn get_map(n_square: usize) -> CMap2<FloatType> {

benches/benches/core/cmap2/constructors.rs

@@ -11,19 +11,15 @@
 //!
 //! Each benchmark is repeated on CMap2 of different sizes.
 
-// ------ IMPORTS
-
 use std::hint::black_box;
 
-use honeycomb_core::cmap::{CMap2, CMapBuilder};
+use honeycomb::core::cmap::{CMap2, CMapBuilder};
 use iai_callgrind::{
     library_benchmark, library_benchmark_group, main, FlamegraphConfig, LibraryBenchmarkConfig,
 };
 
 use honeycomb_benches::FloatType;
 
-// ------ CONTENT
-
 // --- common
 
 fn get_map(n_square: usize) -> CMap2<FloatType> {

benches/benches/core/cmap2/fetch_icells.rs

@@ -1,11 +1,7 @@
-// ------ IMPORTS
-
 use criterion::{black_box, criterion_group, criterion_main, BenchmarkId, Criterion};
-use honeycomb::prelude::CMap2;
-use honeycomb_benches::FloatType;
-use honeycomb_core::cmap::CMapBuilder;
+use honeycomb::core::cmap::{CMap2, CMapBuilder};
 
-// ------ CONTENT
+use honeycomb_benches::FloatType;
 
 pub fn criterion_benchmark(c: &mut Criterion) {
     let n_square = 512;

benches/benches/core/cmap2/link_and_sew.rs

@@ -10,19 +10,15 @@
 //!
 //! Each benchmark is repeated on CMap2 of different sizes.
 
-// ------ IMPORTS
-
 use std::hint::black_box;
 
-use honeycomb_core::cmap::{CMap2, CMapBuilder};
+use honeycomb::core::cmap::{CMap2, CMapBuilder};
 use iai_callgrind::{
     library_benchmark, library_benchmark_group, main, FlamegraphConfig, LibraryBenchmarkConfig,
 };
 
 use honeycomb_benches::FloatType;
 
-// ------ CONTENT
-
 // --- common
 
 fn get_map(n_square: usize) -> CMap2<FloatType> {

benches/benches/grisubal/grid_size.rs

@@ -1,13 +1,10 @@
-// ------ IMPORTS
-
 use criterion::{black_box, criterion_group, criterion_main, BenchmarkId, Criterion, Throughput};
 use honeycomb::prelude::{
     grisubal::{grisubal, Clip},
     CMap2,
 };
-use honeycomb_benches::FloatType;
 
-// ------ CONTENT
+use honeycomb_benches::FloatType;
 
 pub fn criterion_benchmark(c: &mut Criterion) {
     // passing args to cargo bench filters bench instead of actually reading args;

benches/benches/grisubal/time.rs

@@ -1,13 +1,10 @@
-// ------ IMPORTS
-
 use criterion::{black_box, criterion_group, criterion_main, BenchmarkId, Criterion};
 use honeycomb::prelude::{
     grisubal::{grisubal, Clip},
     CMap2,
 };
-use honeycomb_benches::FloatType;
 
-// ------ CONTENT
+use honeycomb_benches::FloatType;
 
 pub fn criterion_benchmark(c: &mut Criterion) {
     // passing args to cargo bench filters bench instead of actually reading args;

benches/benches/triangulate/quads.rs

@@ -1,13 +1,10 @@
-// ------ IMPORTS
-
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use honeycomb::prelude::{
     triangulation::{earclip_cell, fan_cell, TriangulateError},
     CMap2, CMapBuilder, DartIdType, Orbit2, OrbitPolicy,
 };
-use honeycomb_benches::FloatType;
 
-// ------ CONTENT
+use honeycomb_benches::FloatType;
 
 const PATH: &str = "../examples/quads.vtk";
 

honeycomb-core/src/attributes/collections.rs

@@ -3,7 +3,7 @@
 //! This module contains all code used to describe custom collections used to store attributes
 //! (see [`AttributeBind`], [`AttributeUpdate`]).
 
-// ------ IMPORTS
+use num_traits::ToPrimitive;
 
 use crate::attributes::{
     AttributeBind, AttributeError, AttributeStorage, AttributeUpdate, UnknownAttributeStorage,
@@ -13,10 +13,6 @@ use crate::stm::{
     abort, atomically, StmClosureResult, TVar, Transaction, TransactionClosureResult,
 };
 
-use num_traits::ToPrimitive;
-
-// ------ CONTENT
-
 /// Custom storage structure
 ///
 /// **This structure is not meant to be used directly** but with the [`AttributeBind`] trait.

honeycomb-core/src/attributes/manager.rs

@@ -3,8 +3,6 @@
 //! this module contains all code used to implement a manager struct, used to handle generic
 //! attributes embedded in a given combinatorial map.
 
-// ------ IMPORTS
-
 use std::{any::TypeId, collections::HashMap};
 
 use crate::attributes::{
@@ -13,8 +11,6 @@ use crate::attributes::{
 use crate::cmap::{DartIdType, OrbitPolicy};
 use crate::stm::{StmClosureResult, Transaction, TransactionClosureResult};
 
-// ------ CONTENT
-
 // convenience macros
 
 macro_rules! get_storage {

honeycomb-core/src/attributes/tests.rs

@@ -1,5 +1,3 @@
-// ------ IMPORTS
-
 use std::any::Any;
 
 use loom::sync::Arc;
@@ -14,8 +12,6 @@ use crate::{
     stm::{atomically, StmError, Transaction, TransactionControl},
 };
 
-// ------ CONTENT
-
 // --- basic structure implementation
 
 // vertex bound

honeycomb-core/src/attributes/traits.rs

@@ -3,19 +3,15 @@
 //! This module contains all code used to handle attribute genericity in the context of mesh
 //! representation through combinatorial maps embedded data.
 
-// ------ IMPORTS
-
-use crate::attributes::AttributeError;
-use crate::cmap::{DartIdType, OrbitPolicy};
-use crate::stm::{atomically, StmClosureResult, Transaction};
+use std::any::{type_name, Any};
+use std::fmt::Debug;
 
 use downcast_rs::{impl_downcast, Downcast};
 use fast_stm::TransactionClosureResult;
 
-use std::any::{type_name, Any};
-use std::fmt::Debug;
-
-// ------ CONTENT
+use crate::attributes::AttributeError;
+use crate::cmap::{DartIdType, OrbitPolicy};
+use crate::stm::{atomically, StmClosureResult, Transaction};
 
 /// # Generic attribute trait
 ///

honeycomb-core/src/cmap/builder/mod.rs

@@ -1,18 +1,11 @@
 //! Builder implementation for combinatorial map structures.
 
-// ------ MODULE DECLARATIONS
-
 pub mod grid;
 pub mod io;
 pub mod structure;
 
-// ------ RE-EXPORTS
-
 pub use grid::GridDescriptor;
 pub use structure::{BuilderError, CMapBuilder};
 
-// ------ CONTENT
-
-// ------ TESTS
 #[cfg(test)]
 mod tests;

honeycomb-core/src/cmap/builder/structure.rs

@@ -1,5 +1,3 @@
-// ------ IMPORTS
-
 use std::fs::File;
 use std::io::Read;
 
@@ -12,8 +10,6 @@ use crate::geometry::CoordsFloat;
 
 use super::io::CMapFile;
 
-// ------ CONTENT
-
 /// # Builder-level error enum
 ///
 /// This enum is used to describe all non-panic errors that can occur when using the builder

honeycomb-core/src/cmap/components/betas.rs

@@ -1,14 +1,10 @@
-// ------ IMPORTS
-
 use std::ops::{Index, IndexMut};
 
 use crate::cmap::{LinkError, NULL_DART_ID};
 use crate::stm::{abort, TVar, Transaction, TransactionClosureResult};
 
 use super::identifiers::DartIdType;
 
-// ------ CONTENT
-
 /// Beta functions storage.
 ///
 /// `N` is the number of beta function stored, including `B0`. This means that, for example,

honeycomb-core/src/cmap/components/unused.rs

@@ -1,5 +1,3 @@
-// ------ IMPORTS
-
 use std::{
     ops::{Index, IndexMut},
     slice::Iter,
@@ -9,8 +7,6 @@ use crate::stm::TVar;
 
 use super::identifiers::DartIdType;
 
-// ------ CONTENT
-
 /// Unused dart tracking structure.
 pub struct UnusedDarts(Vec<TVar<bool>>);
 

honeycomb-core/src/cmap/dim2/basic_ops.rs

@@ -7,8 +7,6 @@
 //! - Beta function interfaces
 //! - i-cell computations
 
-// ------ IMPORTS
-
 use std::collections::{HashSet, VecDeque};
 
 use crate::attributes::UnknownAttributeStorage;
@@ -18,8 +16,6 @@ use crate::cmap::{
 use crate::geometry::CoordsFloat;
 use crate::stm::{atomically, StmClosureResult, Transaction};
 
-// ------ CONTENT
-
 /// **Dart-related methods**
 impl<T: CoordsFloat> CMap2<T> {
     // --- read

honeycomb-core/src/cmap/dim2/embed.rs

@@ -4,17 +4,13 @@
 //! map. This includes operations regarding vertices as well as (in the future) user-defined
 //! generic attributes
 
-// ------ IMPORT
-
 use crate::cmap::{CMap2, VertexIdType};
 use crate::stm::{StmClosureResult, Transaction};
 use crate::{
     attributes::{AttributeBind, AttributeStorage, AttributeUpdate, UnknownAttributeStorage},
     geometry::{CoordsFloat, Vertex2},
 };
 
-// ------ CONTENT
-
 /// **Built-in vertex-related methods**
 impl<T: CoordsFloat> CMap2<T> {
     /// Return the current number of vertices.

honeycomb-core/src/cmap/dim2/mod.rs

@@ -5,8 +5,6 @@
 //! The definitions are re-exported, direct interaction with this module
 //! should be minimal, if existing at all.
 
-// ------ MODULE DECLARATIONS
-
 pub mod basic_ops;
 pub mod embed;
 pub mod links;
@@ -16,13 +14,9 @@ pub mod sews;
 pub mod structure;
 pub mod utils;
 
-// ------ CONTENT
-
 /// Number of beta functions defined for [`CMap2`].
 const CMAP2_BETA: usize = 3;
 
-// ------ TESTS
-
 #[allow(unused_mut)]
 #[cfg(test)]
 mod tests;

honeycomb-core/src/cmap/dim2/orbits.rs

@@ -3,15 +3,11 @@
 //! This module contains all code used to model orbits, a notion defined
 //! along the structure of combinatorial maps.
 
-// ------ IMPORTS
-
 use std::collections::{BTreeSet, VecDeque};
 
 use crate::cmap::{CMap2, DartIdType, OrbitPolicy, NULL_DART_ID};
 use crate::geometry::CoordsFloat;
 
-// ------ CONTENT
-
 /// # Generic 2D orbit implementation
 ///
 /// This structure only contains meta-data about the orbit in its initial state. All the darts

honeycomb-core/src/cmap/dim2/structure.rs

@@ -3,16 +3,12 @@
 //! This module contains the main structure definition ([`CMap2`]) as well as its constructor
 //! implementation.
 
-// ------ IMPORTS
-
 use crate::attributes::{AttrSparseVec, AttrStorageManager, UnknownAttributeStorage};
 use crate::cmap::components::{betas::BetaFunctions, unused::UnusedDarts};
 use crate::geometry::{CoordsFloat, Vertex2};
 
 use super::CMAP2_BETA;
 
-// ------ CONTENT
-
 /// # 2D combinatorial map implementation
 ///
 /// Information regarding maps can be found in the [user guide][UG].