Migrate to 1.95 rust

Author: reinterpretcat

Dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1.92-alpine AS builder
+FROM rust:1.95-alpine AS builder
 
 LABEL maintainer="Ilya Builuk <ilya.builuk@gmail.com>" \
       org.opencontainers.image.title="A Vehicle Routing Problem solver CLI" \

experiments/heuristic-research/src/solver/state.rs

@@ -170,7 +170,7 @@ impl HyperHeuristicState {
             );
             search_states
                 .values_mut()
-                .for_each(|states| states.sort_by(|SearchResult(a, ..), SearchResult(b, ..)| a.cmp(b)));
+                .for_each(|states| states.sort_by_key(|SearchResult(a, ..)| *a));
 
             let mut heuristic_states =
                 data.lines().skip_while(|line| *line != "heuristic:").skip(2).take_while(|line| !line.is_empty()).fold(
@@ -200,7 +200,7 @@ impl HyperHeuristicState {
                 );
             heuristic_states
                 .values_mut()
-                .for_each(|states| states.sort_by(|HeuristicResult(_, a, ..), HeuristicResult(_, b, ..)| a.cmp(b)));
+                .for_each(|states| states.sort_by_key(|HeuristicResult(_, a, ..)| *a));
 
             Some(Self { names, states, search_states, heuristic_states })
         } else {

rosomaxa/src/termination/min_variation.rs

@@ -92,7 +92,7 @@ where
 
                         result
                     });
-                    values.sort_unstable_by(|(a, _), (b, _)| a.cmp(b));
+                    values.sort_unstable_by_key(|(a, _)| *a);
                 }
 
                 if *period > elapsed_time || values.len() < 2 {

rosomaxa/tests/unit/utils/iterators_test.rs

@@ -163,7 +163,7 @@ mod sampling_search {
             })
             .collect::<Vec<_>>();
 
-        results.sort_by(|(a, _), (b, _)| a.cmp(b));
+        results.sort_by_key(|(a, _)| *a);
         let median = results[results.len() / 2];
         assert!(median.0 < 250);
         assert!(results.iter().all(|(_, count)| *count < 100));

vrp-cli/src/extensions/generate/plan.rs

@@ -97,8 +97,8 @@ fn get_location_fn(
         };
         Ok(Box::new(move |rnd| {
             // TODO allow to configure distribution
-            let lat = rnd.uniform_real((bounding_box.0).0 as Float, (bounding_box.1).0 as Float) as f64;
-            let lng = rnd.uniform_real((bounding_box.0).1 as Float, (bounding_box.1).1 as Float) as f64;
+            let lat = rnd.uniform_real((bounding_box.0).0 as Float, (bounding_box.1).0 as Float);
+            let lng = rnd.uniform_real((bounding_box.0).1 as Float, (bounding_box.1).1 as Float);
 
             Location::Coordinate { lat, lng }
         }))

vrp-core/src/algorithms/clustering/dbscan.rs

@@ -49,7 +49,7 @@ where
                     if other_neighbours.len() >= min_points {
                         neighbors
                             .extend(other_neighbours.iter().filter(|&point| !neighbors_index.contains(point)).cloned());
-                        neighbors_index.extend(other_neighbours.into_iter());
+                        neighbors_index.extend(other_neighbours);
                     }
                 }
 

vrp-core/src/models/problem/costs.rs

@@ -239,7 +239,7 @@ impl<T: TransportFallback> TimeAgnosticMatrixTransportCost<T> {
     /// Creates an instance of `TimeAgnosticMatrixTransportCost`.
     pub fn new(costs: Vec<MatrixData>, size: usize, fallback: T) -> Result<Self, GenericError> {
         let mut costs = costs;
-        costs.sort_by(|a, b| a.index.cmp(&b.index));
+        costs.sort_by_key(|a| a.index);
 
         if costs.iter().any(|costs| costs.timestamp.is_some()) {
             return Err("time aware routing".into());
@@ -316,7 +316,7 @@ impl<T: TransportFallback> TimeAwareMatrixTransportCost<T> {
         let costs = costs
             .into_iter()
             .map(|(profile, mut matrices)| {
-                matrices.sort_by(|a, b| (a.timestamp.unwrap() as u64).cmp(&(b.timestamp.unwrap() as u64)));
+                matrices.sort_by_key(|a| a.timestamp.unwrap() as u64);
                 let timestamps = matrices.iter().map(|matrix| matrix.timestamp.unwrap() as u64).collect();
 
                 (profile, (timestamps, matrices))

vrp-core/src/models/problem/fleet.rs

@@ -161,7 +161,7 @@ impl Fleet {
 
         let profiles: HashMap<usize, Profile> = vehicles.iter().map(|v| (v.profile.index, v.profile.clone())).collect();
         let mut profiles = profiles.into_iter().collect::<Vec<_>>();
-        profiles.sort_by(|(a, _), (b, _)| a.cmp(b));
+        profiles.sort_by_key(|(a, _)| *a);
         let (_, profiles): (Vec<_>, Vec<_>) = profiles.into_iter().unzip();
 
         let actors = vehicles

vrp-core/src/models/solution/registry.rs

@@ -46,12 +46,12 @@ impl Registry {
 
     /// Returns list of all available actors.
     pub fn available(&'_ self) -> impl Iterator<Item = Arc<Actor>> + '_ {
-        self.available.iter().flat_map(|(_, set)| set.iter().cloned())
+        self.available.values().flat_map(|set| set.iter().cloned())
     }
 
     /// Returns next available actors from each different type.
     pub fn next(&'_ self) -> impl Iterator<Item = Arc<Actor>> + '_ {
-        self.available.iter().flat_map(move |(_, set)| {
+        self.available.values().flat_map(|set| {
             // NOTE pick a random actor from set of available actors.
             let skip_amount = if set.len() < 2 { 0 } else { self.random.uniform_int(0, set.len() as i32 - 1) as usize };
             set.iter().skip(skip_amount).take(1).cloned()

vrp-core/src/models/solution/route.rs

@@ -123,7 +123,7 @@ impl Activity {
 
     /// Checks whether activity job has a parent multi job.
     pub fn has_parent_job(&self) -> bool {
-        self.job.as_ref().map_or(false, |single| Multi::is_child(single))
+        self.job.as_ref().is_some_and(|single| Multi::is_child(single))
     }
 
     /// Returns job if activity has it.