Rust 1 95 (#126)

* Performance monitor fixes

* Rust 1.95

Author: UdHo

rust-toolchain.toml

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.94.0"
+channel = "1.95.0"
 profile = "minimal"

src/bin/mapcat/sender.rs

@@ -145,7 +145,7 @@ impl MapSender {
       return false;
     }
 
-    while let Err(e) = surf::get(format!("http://localhost:{DEFAULT_PORT}/healthcheck",))
+    while let Err(e) = surf::get(format!("http://localhost:{DEFAULT_PORT}/healthcheck"))
       .send()
       .await
     {

src/map/mapvas_egui/layer/shape_layer.rs

@@ -382,7 +382,7 @@ impl ShapeLayer {
         received = true;
         let l = self.shape_map.entry(id.clone()).or_default();
         let start_idx = l.len();
-        l.extend(geometries.into_iter());
+        l.extend(geometries);
         self.layer_visibility.entry(id.clone()).or_insert(true);
 
         for i in start_idx..l.len() {
@@ -2675,14 +2675,12 @@ impl ShapeLayer {
 
     for &path_index in nested_path {
       match current_geometry {
-        Geometry::GeometryCollection(nested_geometries, _) => {
-          if path_index < nested_geometries.len() {
-            current_geometry = &nested_geometries[path_index];
-          } else {
-            return None; // Invalid path index
-          }
+        Geometry::GeometryCollection(nested_geometries, _)
+          if path_index < nested_geometries.len() =>
+        {
+          current_geometry = &nested_geometries[path_index];
         }
-        _ => return None, // Path continues but current geometry is not a collection
+        _ => return None,
       }
     }
 

src/map/mapvas_egui/layer/tile_layer.rs

@@ -419,7 +419,7 @@ impl TileLayer {
           });
 
         let render_result =
-          tokio::time::timeout(std::time::Duration::from_secs(60), render_rx).await;
+          tokio::time::timeout(std::time::Duration::from_mins(1), render_rx).await;
 
         let render_duration = render_start.elapsed();
 

src/mapvas_ui.rs

@@ -802,7 +802,7 @@ impl Sidebar {
     for category in category_order {
       if let Some(mut tasks) = tasks_by_category.remove(&category) {
         // Sort by elapsed time (newest first)
-        tasks.sort_by_key(|(_, task)| std::cmp::Reverse(task.elapsed()));
+        tasks.sort_by_cached_key(|(_, task)| std::cmp::Reverse(task.elapsed()));
 
         let category_name = match category {
           TaskCategory::TileLoad => "🗺 Tile Loading",

src/parser/geojson.rs

@@ -760,23 +760,21 @@ mod tests {
 
       for geometry in &layer.geometries {
         match geometry {
-          Geometry::Point(_, metadata) => {
+          Geometry::Point(_, metadata)
             if metadata
               .time_data
               .as_ref()
-              .is_some_and(|td| td.timestamp.is_some())
-            {
-              features_with_timestamps += 1;
-            }
+              .is_some_and(|td| td.timestamp.is_some()) =>
+          {
+            features_with_timestamps += 1;
           }
-          Geometry::LineString(_, metadata) => {
+          Geometry::LineString(_, metadata)
             if metadata
               .time_data
               .as_ref()
-              .is_some_and(|td| td.time_span.is_some())
-            {
-              features_with_time_spans += 1;
-            }
+              .is_some_and(|td| td.time_span.is_some()) =>
+          {
+            features_with_time_spans += 1;
           }
           _ => {}
         }

src/parser/gpx.rs

@@ -340,19 +340,16 @@ mod tests {
 
       for geometry in &layer.geometries {
         match geometry {
-          Geometry::Point(_, metadata) => {
-            if metadata.time_data.is_some() {
-              timestamped_points += 1;
-            }
+          Geometry::Point(_, metadata) if metadata.time_data.is_some() => {
+            timestamped_points += 1;
           }
-          Geometry::LineString(_, metadata) => {
+          Geometry::LineString(_, metadata)
             if metadata
               .time_data
               .as_ref()
-              .is_some_and(|td| td.time_span.is_some())
-            {
-              linestrings_with_timespan += 1;
-            }
+              .is_some_and(|td| td.time_span.is_some()) =>
+          {
+            linestrings_with_timespan += 1;
           }
           _ => {}
         }

src/remote.rs

@@ -144,7 +144,7 @@ pub async fn remote_runner(remote: Remote) {
 
   // Keep it running.
   loop {
-    tokio::time::sleep(tokio::time::Duration::from_secs(3600)).await;
+    tokio::time::sleep(tokio::time::Duration::from_hours(1)).await;
   }
 }
 

src/search.rs

@@ -172,11 +172,7 @@ impl SearchManager {
     }
 
     // Sort by relevance (highest first)
-    all_results.sort_by(|a, b| {
-      b.relevance
-        .partial_cmp(&a.relevance)
-        .unwrap_or(std::cmp::Ordering::Equal)
-    });
+    all_results.sort_by(|a, b| b.relevance.total_cmp(&a.relevance));
 
     // Limit total results
     all_results.truncate(10);

tests/grid_snapshot_tests.rs

@@ -11,7 +11,7 @@ use std::fs;
 use std::io::Cursor;
 
 fn create_test_app_with_geojson_grid_mode(geojson_content: String) -> MapApp {
-  let config = Config::new();
+  let config = Config::default();
   let ctx = egui::Context::default();
   let (mut map, remote, data_holder) = Map::new(ctx);
   map.set_headless();
@@ -33,7 +33,7 @@ fn create_test_app_with_geojson_grid_mode(geojson_content: String) -> MapApp {
 }
 
 fn create_test_app_grid_mode() -> MapApp {
-  let config = Config::new();
+  let config = Config::default();
   let ctx = egui::Context::default();
   let (mut map, remote, data_holder) = Map::new(ctx);
   map.set_headless();