From 3d6409920224f9b82819ef2a6430756efefe0466 Mon Sep 17 00:00:00 2001 From: reinterpretcat Date: Fri, 9 Feb 2024 20:52:37 +0100 Subject: [PATCH] Update toolchain --- Dockerfile | 2 +- vrp-pragmatic/tests/generator/relations.rs | 2 +- vrp-pragmatic/tests/helpers/problem.rs | 2 +- vrp-pragmatic/tests/unit/format/problem/reader_test.rs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index b63131bd0..5b8f65e9d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.75-alpine AS Builder +FROM rust:1.76-alpine AS Builder LABEL maintainer="Ilya Builuk " \ org.opencontainers.image.title="A Vehicle Routing Problem solver CLI" \ diff --git a/vrp-pragmatic/tests/generator/relations.rs b/vrp-pragmatic/tests/generator/relations.rs index 2673b260c..9be426f24 100644 --- a/vrp-pragmatic/tests/generator/relations.rs +++ b/vrp-pragmatic/tests/generator/relations.rs @@ -6,7 +6,7 @@ use std::sync::RwLock; /// Generate relations. pub fn generate_relations( - jobs: &Vec, + jobs: &[Job], vehicles: &[VehicleType], total_relations: Range, jobs_per_relation: Range, diff --git a/vrp-pragmatic/tests/helpers/problem.rs b/vrp-pragmatic/tests/helpers/problem.rs index 6621512aa..949622cff 100644 --- a/vrp-pragmatic/tests/helpers/problem.rs +++ b/vrp-pragmatic/tests/helpers/problem.rs @@ -322,7 +322,7 @@ pub fn all_of_skills(skills: Vec) -> JobSkills { JobSkills { all_of: Some(skills), one_of: None, none_of: None } } -fn convert_times(times: &Vec<(i32, i32)>) -> Option>> { +fn convert_times(times: &[(i32, i32)]) -> Option>> { if times.is_empty() { None } else { diff --git a/vrp-pragmatic/tests/unit/format/problem/reader_test.rs b/vrp-pragmatic/tests/unit/format/problem/reader_test.rs index aed366c0d..c2d29f22b 100644 --- a/vrp-pragmatic/tests/unit/format/problem/reader_test.rs +++ b/vrp-pragmatic/tests/unit/format/problem/reader_test.rs @@ -28,7 +28,7 @@ fn assert_time_window(tw: &TimeWindow, expected: &(f64, f64)) { assert_eq!(tw.end, expected.1); } -fn assert_time_spans(tws: &Vec, expected: Vec<(f64, f64)>) { +fn assert_time_spans(tws: &[TimeSpan], expected: Vec<(f64, f64)>) { assert_eq!(tws.len(), expected.len()); (0..tws.len()).for_each(|index| { assert_time_window(&tws.get(index).and_then(|tw| tw.as_time_window()).unwrap(), expected.get(index).unwrap());