Skip to content

Commit a436500

Browse files
authored
Merge pull request #117 from codecrafters-io/andy/upgrade
[HTTP] CC-1645: Upgrade Rust to 1.85
2 parents 1441ccd + 2db87ca commit a436500

File tree

9 files changed

+26
-7
lines changed

9 files changed

+26
-7
lines changed

compiled_starters/rust/.codecrafters/run.sh

+2
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,6 @@
66
#
77
# Learn more: https://codecrafters.io/program-interface
88

9+
set -e # Exit on failure
10+
911
exec /tmp/codecrafters-build-http-server-rust/release/codecrafters-http-server "$@"

compiled_starters/rust/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Time to move on to the next stage!
3030

3131
Note: This section is for stages 2 and beyond.
3232

33-
1. Ensure you have `cargo (1.82)` installed locally
33+
1. Ensure you have `cargo (1.85)` installed locally
3434
1. Run `./your_program.sh` to run your program, which is implemented in
3535
`src/main.rs`. This command compiles your Rust project, so it might be slow
3636
the first time you run it. Subsequent runs will be fast.

compiled_starters/rust/codecrafters.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ debug: false
77
# Use this to change the Rust version used to run your code
88
# on Codecrafters.
99
#
10-
# Available versions: rust-1.82
11-
language_pack: rust-1.82
10+
# Available versions: rust-1.85
11+
language_pack: rust-1.85

dockerfiles/rust-1.85.Dockerfile

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# syntax=docker/dockerfile:1.7-labs
2+
FROM rust:1.85-bookworm
3+
4+
# Rebuild the container if these files change
5+
ENV CODECRAFTERS_DEPENDENCY_FILE_PATHS="Cargo.toml,Cargo.lock"
6+
7+
WORKDIR /app
8+
9+
# .git & README.md are unique per-repository. We ignore them on first copy to prevent cache misses
10+
COPY --exclude=.git --exclude=README.md . /app
11+
12+
# This runs cargo build
13+
RUN .codecrafters/compile.sh

solutions/rust/01-at4/code/.codecrafters/run.sh

+2
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,6 @@
66
#
77
# Learn more: https://codecrafters.io/program-interface
88

9+
set -e # Exit on failure
10+
911
exec /tmp/codecrafters-build-http-server-rust/release/codecrafters-http-server "$@"

solutions/rust/01-at4/code/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Time to move on to the next stage!
3030

3131
Note: This section is for stages 2 and beyond.
3232

33-
1. Ensure you have `cargo (1.82)` installed locally
33+
1. Ensure you have `cargo (1.85)` installed locally
3434
1. Run `./your_program.sh` to run your program, which is implemented in
3535
`src/main.rs`. This command compiles your Rust project, so it might be slow
3636
the first time you run it. Subsequent runs will be fast.

solutions/rust/01-at4/code/codecrafters.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ debug: false
77
# Use this to change the Rust version used to run your code
88
# on Codecrafters.
99
#
10-
# Available versions: rust-1.82
11-
language_pack: rust-1.82
10+
# Available versions: rust-1.85
11+
language_pack: rust-1.85

starter_templates/rust/code/.codecrafters/run.sh

+2
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,6 @@
66
#
77
# Learn more: https://codecrafters.io/program-interface
88

9+
set -e # Exit on failure
10+
911
exec /tmp/codecrafters-build-http-server-rust/release/codecrafters-http-server "$@"

starter_templates/rust/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
attributes:
2-
required_executable: cargo (1.82)
2+
required_executable: cargo (1.85)
33
user_editable_file: src/main.rs

0 commit comments

Comments
 (0)