Update toolchain version to 1.78

reinterpretcat · May 2, 2024 · cd7797b · cd7797b
1 parent 721c2a3
commit cd7797b
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 12 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.77-alpine AS Builder
+FROM rust:1.78-alpine AS Builder
 
 LABEL maintainer="Ilya Builuk <ilya.builuk@gmail.com>" \
       org.opencontainers.image.title="A Vehicle Routing Problem solver CLI" \

diff --git a/experiments/heuristic-research/src/plots/drawing/draw_population.rs b/experiments/heuristic-research/src/plots/drawing/draw_population.rs
@@ -162,7 +162,7 @@ pub(crate) fn draw_on_area<B: DrawingBackend + 'static>(
                 // draw local optimum markers
                 rows.clone()
                     .cartesian_product(cols.clone())
-                    .filter(|&(x, y)| (series[0].matrix_fn)().get(&Coordinate(x, y)).is_some())
+                    .filter(|&(x, y)| (series[0].matrix_fn)().contains_key(&Coordinate(x, y)))
                     .filter(|&(x, y)| {
                         get_neighbours(x, y)
                             .map(|coordinate| to_relation(&Coordinate(x, y), &coordinate))

diff --git a/experiments/heuristic-research/src/plots/drawing/draw_search.rs b/experiments/heuristic-research/src/plots/drawing/draw_search.rs
@@ -33,7 +33,7 @@ fn draw_search_statistics<B: DrawingBackend + 'static>(
     area: &DrawingArea<B, Shift>,
     statistics: &[(String, usize)],
 ) -> DrawResult<()> {
-    let mut statistics = statistics.iter().cloned().collect::<Vec<_>>();
+    let mut statistics = statistics.to_vec();
 
     statistics.sort_by(|(_, a), (_, b)| b.cmp(a));
 

diff --git a/experiments/heuristic-research/src/plots/mod.rs b/experiments/heuristic-research/src/plots/mod.rs
@@ -350,13 +350,6 @@ fn get_population_series(generation: usize) -> PopulationSeries {
 }
 
 fn get_axis_sizes() -> (f64, f64, f64) {
-    #[derive(Serialize)]
-    struct Axis {
-        pub x: f64,
-        pub y: f64,
-        pub z: f64,
-    }
-
     EXPERIMENT_DATA.lock().unwrap().on_generation.iter().fold((0_f64, 0_f64, 0_f64), |acc, (_, (_, data))| {
         data.iter().fold(acc, |(max_x, max_y, max_z), data| {
             let &DataPoint3D(x, y, z) = match data {

diff --git a/vrp-pragmatic/src/format/solution/solution_writer.rs b/vrp-pragmatic/src/format/solution/solution_writer.rs
@@ -308,8 +308,8 @@ fn create_tour(
             }
         });
 
-    tour.vehicle_id = vehicle.dimens.get_vehicle_id().unwrap().clone();
-    tour.type_id = vehicle.dimens.get_vehicle_type().unwrap().clone();
+    tour.vehicle_id.clone_from(vehicle.dimens.get_vehicle_id().unwrap());
+    tour.type_id.clone_from(vehicle.dimens.get_vehicle_type().unwrap());
 
     tour
 }