Skip to content

Commit 94025e9

Browse files
authored
chore: update Rust toolchain to v1.81.0 (#605)
* chore: update Rust toolchain to v1.81.0 * chore: fix coverage test * chore: revert probe-rs installation refactor
1 parent b8b949b commit 94025e9

2 files changed

Lines changed: 6 additions & 5 deletions

File tree

.devcontainer/rust/Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
FROM ubuntu:24.04@sha256:ab64a8382e935382638764d8719362bb50ee418d944c1f3d26e0c99fae49a345
22

33
ARG BATS_VERSION=1.11.0
4-
ARG CARGO_BINSTALL_VERSION=1.6.8
5-
ARG RUST_VERSION=1.78.0
4+
ARG CARGO_BINSTALL_VERSION=1.10.8
5+
ARG RUST_VERSION=1.81.0
66

77
ARG DEBIAN_FRONTEND=noninteractive
88

@@ -43,8 +43,9 @@ RUN batstmp="$(mktemp -d /tmp/bats-core-${BATS_VERSION}.XXXX)" \
4343
RUN update-alternatives --install /usr/bin/cc cc /usr/bin/gcc-13 20 \
4444
&& cp /etc/skel/.bashrc /root/.bashrc
4545

46+
ENV BINSTALL_DISABLE_TELEMETRY=true
4647
# Install additional rust tools
4748
RUN wget -qO - "https://github.com/cargo-bins/cargo-binstall/releases/download/v${CARGO_BINSTALL_VERSION}/cargo-binstall-$(uname -m)-unknown-linux-gnu.tgz" | tar xz -C "/usr/bin" \
48-
&& cargo-binstall -y --locked cargo-binutils@0.3.6 cargo-mutants@24.5.0 flip-link@0.1.8 \
49+
&& cargo-binstall -y --locked cargo-binutils@0.3.6 cargo-mutants@24.9.0 flip-link@0.1.9 \
4950
# cargo-binstall can't (yet) install probe-rs-tools for aarch64, fall-back to script installation
5051
&& wget -qO - https://github.com/probe-rs/probe-rs/releases/download/v0.24.0/probe-rs-tools-installer.sh | sh

.devcontainer/rust/test/testsuite.bats

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,14 @@ EOF
7373

7474
@test "coverage information should be generated when running a testsuite" {
7575
pushd test
76-
76+
7777
RUSTFLAGS="-C instrument-coverage" run cargo test
7878
assert_success
7979
assert_output --partial "test result: ok. 2 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out;"
8080

8181
cargo profdata -- merge -sparse default_*.profraw -o default.profdata
8282

83-
run cargo cov -- report --instr-profile=default.profdata --object target/debug/deps/test-39ae9a37530d18ea
83+
run cargo cov -- report --instr-profile=default.profdata --object target/debug/deps/test-79ff237e4a2ee06d
8484
assert_success
8585
assert_output --partial "77.78%"
8686

0 commit comments

Comments
 (0)