chore: format

Author: pnwatin

src/convert_file.rs

@@ -5,8 +5,8 @@ use anyhow::{Context, Result};
 
 use crate::convert_pointcloud::{convert_pointcloud, convert_pointclouds};
 
-use crate::stations::save_stations;
 use crate::LasVersion;
+use crate::stations::save_stations;
 
 /// Converts a given e57 file into LAS format and, optionally, as stations.
 ///

src/convert_pointcloud.rs

@@ -4,7 +4,7 @@ use std::path::Path;
 use std::sync::Mutex;
 
 use crate::get_las_writer::get_las_writer;
-use crate::{convert_point::convert_point, utils::create_path, LasVersion};
+use crate::{LasVersion, convert_point::convert_point, utils::create_path};
 
 use anyhow::{Context, Result};
 use e57::{E57Reader, PointCloud};
@@ -52,9 +52,7 @@ pub fn convert_pointcloud(
         let point = p.context("Could not read point: ")?;
 
         if point.color.is_some() {
-            *has_color_mutex
-                .lock()
-                .unwrap_or_else(|poisoned| poisoned.into_inner()) = true;
+            *has_color_mutex.lock().unwrap_or_else(|e| e.into_inner()) = true;
         }
 
         let las_point = match convert_point(point) {
@@ -77,10 +75,8 @@ pub fn convert_pointcloud(
     )
     .context("Unable to create path: ")?;
 
-    let has_color = *has_color_mutex
-        .lock()
-        .unwrap_or_else(|poisoned| poisoned.into_inner());
-    
+    let has_color = *has_color_mutex.lock().unwrap_or_else(|e| e.into_inner());
+
     let mut writer = get_las_writer(
         pointcloud.clone().guid,
         path,
@@ -134,11 +130,9 @@ pub fn convert_pointclouds(
         .par_iter()
         .enumerate()
         .try_for_each(|(index, pointcloud)| -> Result<()> {
-            println!("Saving pointclouds {}...", index);
+            println!("Saving pointclouds {index}...");
 
-            let mut reader = e57_reader_mutex
-                .lock()
-                .unwrap_or_else(|poisoned| poisoned.into_inner());
+            let mut reader = e57_reader_mutex.lock().unwrap_or_else(|e| e.into_inner());
             let pointcloud_reader = reader
                 .pointcloud_simple(pointcloud)
                 .context("Unable to get point cloud iterator: ")?;
@@ -149,9 +143,7 @@ pub fn convert_pointclouds(
                 let point = p.context("Could not read point: ")?;
 
                 if point.color.is_some() {
-                    *has_color_mutex
-                        .lock()
-                        .unwrap_or_else(|poisoned| poisoned.into_inner()) = true;
+                    *has_color_mutex.lock().unwrap_or_else(|e| e.into_inner()) = true;
                 }
 
                 let las_point = match convert_point(point) {
@@ -164,13 +156,13 @@ pub fn convert_pointclouds(
                 max_z = max_z.max(las_point.z);
                 las_points_mutex
                     .lock()
-                    .unwrap_or_else(|poisoned| poisoned.into_inner())
+                    .unwrap_or_else(|e| e.into_inner())
                     .push(las_point);
             }
 
             let mut guard = max_cartesian_mutex
                 .lock()
-                .unwrap_or_else(|poisoned| poisoned.into_inner());
+                .unwrap_or_else(|e| e.into_inner());
             let current_max_cartesian = guard.max(max_x).max(max_y).max(max_z);
             *guard = current_max_cartesian;
 
@@ -187,12 +179,10 @@ pub fn convert_pointclouds(
 
     let max_cartesian = *max_cartesian_mutex
         .lock()
-        .unwrap_or_else(|poisoned| poisoned.into_inner());
-    
-    let has_color = *has_color_mutex
-        .lock()
-        .unwrap_or_else(|poisoned| poisoned.into_inner());
-    
+        .unwrap_or_else(|e| e.into_inner());
+
+    let has_color = *has_color_mutex.lock().unwrap_or_else(|e| e.into_inner());
+
     let mut writer = get_las_writer(
         Some(guid.to_owned()),
         path,
@@ -204,9 +194,9 @@ pub fn convert_pointclouds(
 
     let las_points = las_points_mutex
         .lock()
-        .unwrap_or_else(|poisoned| poisoned.into_inner())
+        .unwrap_or_else(|e| e.into_inner())
         .clone();
-    
+
     for p in las_points {
         writer.write_point(p).context("Unable to write: ")?;
     }

src/main.rs

@@ -1,6 +1,6 @@
 use anyhow::Context;
 use clap::Parser;
-use e57_to_las::{convert_file, LasVersion, Result};
+use e57_to_las::{LasVersion, Result, convert_file};
 
 #[derive(Parser)]
 #[command(author, version, about, long_about = None)]