cargo fmt with 1.85.0

Author: w1th0utnam3

splashsurf/src/convert.rs

@@ -1,11 +1,11 @@
 use crate::io;
-use anyhow::anyhow;
 use anyhow::Context;
+use anyhow::anyhow;
 use clap::value_parser;
 use log::info;
 use splashsurf_lib::mesh::MeshWithData;
 use splashsurf_lib::nalgebra::Vector3;
-use splashsurf_lib::{nalgebra, profile, Aabb3d};
+use splashsurf_lib::{Aabb3d, nalgebra, profile};
 use std::path::PathBuf;
 
 // TODO: Support double input/output
@@ -62,8 +62,11 @@ pub fn convert_subcommand(cmd_args: &ConvertSubcommandArgs) -> Result<(), anyhow
     match (&cmd_args.input_particles, &cmd_args.input_mesh) {
         (Some(_), _) => convert_particles(cmd_args)?,
         (_, Some(_)) => convert_mesh(cmd_args)?,
-        (_, _) => return Err(anyhow!(
-                "Aborting: No input file specified, either a particle or mesh input file has to be specified."))
+        (_, _) => {
+            return Err(anyhow!(
+                "Aborting: No input file specified, either a particle or mesh input file has to be specified."
+            ));
+        }
     }
 
     Ok(())

splashsurf/src/io.rs

@@ -1,11 +1,11 @@
 use crate::io::vtk_format::VtkFile;
-use anyhow::{anyhow, Context};
+use anyhow::{Context, anyhow};
 use log::{info, warn};
+use splashsurf_lib::Real;
 use splashsurf_lib::mesh::{
     IntoVtkUnstructuredGridPiece, Mesh3d, MeshAttribute, MeshWithData, TriMesh3d,
 };
 use splashsurf_lib::nalgebra::Vector3;
-use splashsurf_lib::Real;
 use splashsurf_lib::{io, profile};
 use std::collections::HashSet;
 use std::fs::File;

splashsurf/src/reconstruction.rs

@@ -1,14 +1,14 @@
 use crate::reconstruction::arguments::*;
 use crate::{io, logging};
-use anyhow::{anyhow, Context};
+use anyhow::{Context, anyhow};
 use clap::value_parser;
 use indicatif::{ProgressBar, ProgressStyle};
 use log::{error, info};
 use rayon::prelude::*;
 use splashsurf_lib::mesh::{AttributeData, Mesh3d, MeshAttribute, MeshWithData};
 use splashsurf_lib::nalgebra::{Unit, Vector3};
 use splashsurf_lib::sph_interpolation::SphInterpolator;
-use splashsurf_lib::{profile, Aabb3d, Index, Real};
+use splashsurf_lib::{Aabb3d, Index, Real, profile};
 use std::borrow::Cow;
 use std::collections::HashMap;
 use std::convert::TryFrom;
@@ -423,11 +423,11 @@ pub fn reconstruct_subcommand(cmd_args: &ReconstructSubcommandArgs) -> Result<()
 mod arguments {
     use super::ReconstructSubcommandArgs;
     use crate::io;
-    use anyhow::{anyhow, Context};
+    use anyhow::{Context, anyhow};
     use log::info;
-    use regex::{escape, Regex};
-    use splashsurf_lib::nalgebra::Vector3;
+    use regex::{Regex, escape};
     use splashsurf_lib::Aabb3d;
+    use splashsurf_lib::nalgebra::Vector3;
     use std::convert::TryFrom;
     use std::fs;
     use std::path::{Path, PathBuf};
@@ -484,7 +484,11 @@ mod arguments {
         );
 
         if !aabb.is_consistent() {
-            return Err(anyhow!("The user specified {error_str} min/max values are inconsistent! min: {:?} max: {:?}", aabb.min().as_slice(), aabb.max().as_slice()));
+            return Err(anyhow!(
+                "The user specified {error_str} min/max values are inconsistent! min: {:?} max: {:?}",
+                aabb.min().as_slice(),
+                aabb.max().as_slice()
+            ));
         }
 
         if aabb.is_degenerate() {
@@ -632,7 +636,11 @@ mod arguments {
                 // Ensure that output directory exists/create it
                 if let Some(output_dir) = output_file.parent() {
                     if !output_dir.exists() {
-                        info!("The output directory \"{}\" of the output file \"{}\" does not exist. Trying to create it now...", output_dir.display(), output_file.display());
+                        info!(
+                            "The output directory \"{}\" of the output file \"{}\" does not exist. Trying to create it now...",
+                            output_dir.display(),
+                            output_file.display()
+                        );
                         fs::create_dir_all(output_dir).with_context(|| {
                             format!(
                                 "Unable to create output directory \"{}\"",
@@ -776,7 +784,7 @@ mod arguments {
                     return Err(anyhow!(
                         "The input file path \"{}\" does not end with a filename",
                         args.input_file_or_sequence.display()
-                    ))
+                    ));
                 }
             };
 
@@ -975,7 +983,11 @@ pub(crate) fn reconstruction_pipeline_generic<I: Index, R: Real>(
             ));
             let tris_after = mesh_with_data.mesh.triangles.len();
             let verts_after = mesh_with_data.mesh.vertices.len();
-            info!("Post-processing: Cleanup reduced number of vertices to {:.2}% and number of triangles to {:.2}% of original mesh.", (verts_after as f64 / verts_before as f64) * 100.0, (tris_after as f64 / tris_before as f64) * 100.0)
+            info!(
+                "Post-processing: Cleanup reduced number of vertices to {:.2}% and number of triangles to {:.2}% of original mesh.",
+                (verts_after as f64 / verts_before as f64) * 100.0,
+                (tris_after as f64 / tris_before as f64) * 100.0
+            )
         }
 
         // Decimate mesh if requested
@@ -1320,13 +1332,19 @@ pub(crate) fn reconstruction_pipeline_generic<I: Index, R: Real>(
             }
             _ => unreachable!(),
         } {
-            error!("Checked mesh for problems (holes: {}, non-manifold edges/vertices: {}), problems were found!", postprocessing.check_mesh_closed, postprocessing.check_mesh_manifold);
+            error!(
+                "Checked mesh for problems (holes: {}, non-manifold edges/vertices: {}), problems were found!",
+                postprocessing.check_mesh_closed, postprocessing.check_mesh_manifold
+            );
             error!("{}", err);
             return Err(anyhow!("{}", err))
                 .context(format!("Checked mesh for problems (holes: {}, non-manifold edges/vertices: {}), problems were found!", postprocessing.check_mesh_closed, postprocessing.check_mesh_manifold))
                 .context(format!("Problem found with mesh file \"{}\"", paths.output_file.display()));
         } else {
-            info!("Checked mesh for problems (holes: {}, non-manifold edges/vertices: {}), no problems were found.", postprocessing.check_mesh_closed, postprocessing.check_mesh_manifold);
+            info!(
+                "Checked mesh for problems (holes: {}, non-manifold edges/vertices: {}), no problems were found.",
+                postprocessing.check_mesh_closed, postprocessing.check_mesh_manifold
+            );
         }
     }
 

splashsurf/src/tests/cli.rs

@@ -1,5 +1,5 @@
-use crate::reconstruction::Switch;
 use crate::Subcommand;
+use crate::reconstruction::Switch;
 use std::path::PathBuf;
 
 #[test]

splashsurf_lib/benches/benches/bench_aabb.rs

@@ -1,7 +1,7 @@
-use criterion::{criterion_group, Criterion};
+use criterion::{Criterion, criterion_group};
 use nalgebra::Vector3;
-use splashsurf_lib::io::particles_from_file;
 use splashsurf_lib::Aabb3d;
+use splashsurf_lib::io::particles_from_file;
 use std::time::Duration;
 
 pub fn aabb_from_points(c: &mut Criterion) {

splashsurf_lib/benches/benches/bench_full.rs

@@ -1,11 +1,11 @@
-use criterion::{criterion_group, Criterion};
+use criterion::{Criterion, criterion_group};
 use nalgebra::Vector3;
 use splashsurf_lib::io::particles_from_file;
 #[allow(dead_code)]
 use splashsurf_lib::io::vtk_format::write_vtk;
 use splashsurf_lib::{
-    reconstruct_surface, reconstruct_surface_inplace, GridDecompositionParameters, Parameters,
-    SpatialDecomposition, SurfaceReconstruction,
+    GridDecompositionParameters, Parameters, SpatialDecomposition, SurfaceReconstruction,
+    reconstruct_surface, reconstruct_surface_inplace,
 };
 use std::time::Duration;
 

splashsurf_lib/benches/benches/bench_mesh.rs

@@ -1,9 +1,9 @@
-use criterion::{criterion_group, Criterion};
+use criterion::{Criterion, criterion_group};
 use splashsurf_lib::io::particles_from_file;
 use splashsurf_lib::nalgebra::Vector3;
 use splashsurf_lib::{
-    reconstruct_surface, GridDecompositionParameters, Parameters, SpatialDecomposition,
-    SurfaceReconstruction,
+    GridDecompositionParameters, Parameters, SpatialDecomposition, SurfaceReconstruction,
+    reconstruct_surface,
 };
 use std::path::Path;
 use std::time::Duration;

splashsurf_lib/benches/benches/bench_neighborhood.rs

@@ -1,7 +1,7 @@
-use criterion::{criterion_group, Criterion};
+use criterion::{Criterion, criterion_group};
 use nalgebra::Vector3;
 use splashsurf_lib::io;
-use splashsurf_lib::{neighborhood_search, Aabb3d};
+use splashsurf_lib::{Aabb3d, neighborhood_search};
 use std::time::Duration;
 
 static PARTICLE_RADIUS: f64 = 0.025;

splashsurf_lib/benches/benches/bench_subdomain_grid.rs

@@ -1,9 +1,9 @@
-use criterion::{criterion_group, Criterion, SamplingMode};
+use criterion::{Criterion, SamplingMode, criterion_group};
 use nalgebra::Vector3;
 use splashsurf_lib::io::particles_from_file;
 use splashsurf_lib::{
-    reconstruct_surface, GridDecompositionParameters, Parameters, SpatialDecomposition,
-    SurfaceReconstruction,
+    GridDecompositionParameters, Parameters, SpatialDecomposition, SurfaceReconstruction,
+    reconstruct_surface,
 };
 use std::time::Duration;
 

splashsurf_lib/examples/minimal_levelset.rs

@@ -2,14 +2,14 @@
 
 use anyhow::anyhow;
 use sdfu::SDF;
+use splashsurf_lib::Aabb3d;
+use splashsurf_lib::Real;
 #[cfg(feature = "io")]
 use splashsurf_lib::io;
 use splashsurf_lib::marching_cubes::marching_cubes_lut::marching_cubes_triangulation_iter;
 use splashsurf_lib::mesh::TriMesh3d;
 use splashsurf_lib::nalgebra::Vector3;
 use splashsurf_lib::uniform_grid::UniformCartesianCubeGrid3d;
-use splashsurf_lib::Aabb3d;
-use splashsurf_lib::Real;
 use std::collections::HashMap;
 use ultraviolet::vec::Vec3;