Upgrade criterion

Author: w1th0utnam3

Cargo.lock

@@ -62,7 +62,7 @@ fern = "0.7"
 chrono = "0.4"
 
 [dev-dependencies]
-criterion = "0.5.1"
+criterion = "0.6"
 ultraviolet = "0.10"
 sdfu = { git = "https://github.com/w1th0utnam3/sdfu", features = [
   "ultraviolet",

splashsurf_lib/Cargo.toml

@@ -45,7 +45,7 @@ pub fn mesh_vertex_normals(c: &mut Criterion) {
     group.bench_function("mesh_vertex_normals", |b| {
         b.iter(|| {
             let normals = mesh.vertex_normals();
-            criterion::black_box(normals)
+            std::hint::black_box(normals)
         })
     });
 
@@ -65,7 +65,7 @@ pub fn mesh_vertex_normals_parallel(c: &mut Criterion) {
     group.bench_function("mesh_vertex_normals_parallel", |b| {
         b.iter(|| {
             let normals = mesh.par_vertex_normals();
-            criterion::black_box(normals)
+            std::hint::black_box(normals)
         })
     });
 

splashsurf_lib/benches/benches/bench_mesh.rs

@@ -7,6 +7,8 @@ use splashsurf_lib::{
 };
 use std::time::Duration;
 
+static CANYON_PATH: &str = "C:\\canyon.xyz";
+
 fn parameters_canyon() -> Parameters<f32> {
     let particle_radius = 0.011;
     let compact_support_radius = 4.0 * particle_radius;
@@ -31,7 +33,7 @@ fn parameters_canyon() -> Parameters<f32> {
 }
 
 pub fn grid_canyon(c: &mut Criterion) {
-    let particle_positions: &Vec<Vector3<f32>> = &particles_from_file("C:\\canyon.xyz").unwrap();
+    let particle_positions: &Vec<Vector3<f32>> = &particles_from_file(CANYON_PATH).unwrap();
     let parameters = parameters_canyon();
 
     let mut group = c.benchmark_group("grid_canyon");
@@ -89,7 +91,7 @@ pub fn grid_canyon(c: &mut Criterion) {
 }
 
 pub fn grid_optimal_num_cubes_canyon(c: &mut Criterion) {
-    let particle_positions: &Vec<Vector3<f32>> = &particles_from_file("C:\\canyon.xyz").unwrap();
+    let particle_positions: &Vec<Vector3<f32>> = &particles_from_file(CANYON_PATH).unwrap();
     let mut parameters = parameters_canyon();
 
     let mut with_cube_factor = |cube_factor: f32, num_cubes: &[u32]| {