File tree 3 files changed +6
-6
lines changed
3 files changed +6
-6
lines changed Original file line number Diff line number Diff line change 1
1
# always build this using the latest stable release
2
- FROM rust:1.80 .0 AS build-base
2
+ FROM rust:1.85 .0 AS build-base
3
3
4
4
ARG JQ_VERSION=1.6
5
5
ARG JQ_URL=https://github.com/stedolan/jq/releases/download/jq-${JQ_VERSION}/jq-linux64
@@ -48,7 +48,7 @@ RUN cargo generate-lockfile && cargo local-registry --sync Cargo.lock .
48
48
# version tag with a nightly one, pinned to a specific date.
49
49
50
50
# official Dockerfile source:
51
- # https://github.com/rust-lang/docker-rust/blob/master/1.80.0 /bookworm/slim/Dockerfile
51
+ # https://github.com/rust-lang/docker-rust/blob/master/stable /bookworm/slim/Dockerfile
52
52
53
53
# ############### start-copy-pasta ################
54
54
@@ -57,7 +57,7 @@ FROM debian:bookworm-slim
57
57
ENV RUSTUP_HOME=/usr/local/rustup \
58
58
CARGO_HOME=/usr/local/cargo \
59
59
PATH=/usr/local/cargo/bin:$PATH \
60
- RUST_VERSION=nightly-2024-08-02
60
+ RUST_VERSION=nightly-2025-02-20
61
61
# ~~~~~~~~^~~~~~~~~~
62
62
# pin version here
63
63
Original file line number Diff line number Diff line change 2
2
set -eo pipefail
3
3
4
4
# Synopsis:
5
- # Test the test runner by running it against a predefined set of solutions
5
+ # Test the test runner by running it against a predefined set of solutions
6
6
# with an expected output.
7
7
8
8
# Output:
Original file line number Diff line number Diff line change @@ -33,11 +33,11 @@ impl TestResult {
33
33
pub fn fail ( name : String , test_code : String , message : Option < String > ) -> TestResult {
34
34
let name = format_test_name ( name) ;
35
35
36
- let ( output, message) = match message. as_ref ( ) . and_then ( |m| m. split_once ( "thread '" ) ) {
36
+ let ( output, message) = match message. as_ref ( ) . and_then ( |m| m. split_once ( "\n thread '" ) ) {
37
37
Some ( ( output, message) ) if !output. is_empty ( ) => {
38
38
( Some ( output. to_owned ( ) ) , Some ( format ! ( "thread '{message}" ) ) )
39
39
}
40
- _ => ( None , message) ,
40
+ _ => ( None , message. map ( |m| m . trim_start ( ) . to_owned ( ) ) ) ,
41
41
} ;
42
42
43
43
// This note is attached to the error message of only one test case that fails,
You can’t perform that action at this time.
0 commit comments