Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update to rust 1.85 to support 2024 edition #165

Merged
merged 1 commit into from
Feb 21, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# always build this using the latest stable release
FROM rust:1.80.0 AS build-base
FROM rust:1.85.0 AS build-base

ARG JQ_VERSION=1.6
ARG JQ_URL=https://github.com/stedolan/jq/releases/download/jq-${JQ_VERSION}/jq-linux64
Expand Down Expand Up @@ -48,7 +48,7 @@ RUN cargo generate-lockfile && cargo local-registry --sync Cargo.lock .
# version tag with a nightly one, pinned to a specific date.

# official Dockerfile source:
# https://github.com/rust-lang/docker-rust/blob/master/1.80.0/bookworm/slim/Dockerfile
# https://github.com/rust-lang/docker-rust/blob/master/stable/bookworm/slim/Dockerfile

################ start-copy-pasta ################

Expand All @@ -57,7 +57,7 @@ FROM debian:bookworm-slim
ENV RUSTUP_HOME=/usr/local/rustup \
CARGO_HOME=/usr/local/cargo \
PATH=/usr/local/cargo/bin:$PATH \
RUST_VERSION=nightly-2024-08-02
RUST_VERSION=nightly-2025-02-20
# ~~~~~~~~^~~~~~~~~~
# pin version here

Expand Down
2 changes: 1 addition & 1 deletion bin/run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set -eo pipefail

# Synopsis:
# Test the test runner by running it against a predefined set of solutions
# Test the test runner by running it against a predefined set of solutions
# with an expected output.

# Output:
Expand Down
4 changes: 2 additions & 2 deletions src/output.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ impl TestResult {
pub fn fail(name: String, test_code: String, message: Option<String>) -> TestResult {
let name = format_test_name(name);

let (output, message) = match message.as_ref().and_then(|m| m.split_once("thread '")) {
let (output, message) = match message.as_ref().and_then(|m| m.split_once("\nthread '")) {
Some((output, message)) if !output.is_empty() => {
(Some(output.to_owned()), Some(format!("thread '{message}")))
}
_ => (None, message),
_ => (None, message.map(|m| m.trim_start().to_owned())),
};

// This note is attached to the error message of only one test case that fails,
Expand Down
Loading