Skip to content

Commit 222c86d

Browse files
build: use rust stable for linting
Nightly is no longer required since latest update, so we can remove its requirement and thus simplify the devel rather than require using both stable and nightly compiler. This should also reduce the target/debug size as there'll be only builds from one compiler. Signed-off-by: Tiago Castro <tiagolobocastro@gmail.com>
1 parent d68d9f3 commit 222c86d

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

nix/shell/rust.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ let
1919

2020
shellEnv = {
2121
# Path to nightly Rust, needed for linter and style.
22-
RUST_NIGHTLY_PATH = rustChannels.nightly;
22+
# RUST_NIGHTLY_PATH = rustChannels.nightly;
2323

2424
# Path to debug output dir.
2525
RUST_TARGET_DEBUG = "target/debug";

scripts/rust-linter-env.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ fi
4646
# rustfmt and clippy "2021-11-29".
4747
# When upgrading Rust toolchain version, check 'cargo --version',
4848
# 'cargo fmt --version', 'cargo clippy --version' and put them here.
49-
RUST_TOOLCHAIN_VER="2024-10-30"
50-
WANTED_CARGO_VER="cargo 1.84.0-nightly (* 2024-10-25)"
51-
WANTED_RUSTFMT_VER="rustfmt 1.8.0-nightly (* 2024-10-29)"
52-
WANTED_CLIPPY_VER="clippy 0.1.84 (* 2024-10-29)"
49+
RUST_TOOLCHAIN_VER=${RUST_TOOLCHAIN_VER:-"1.82.0"}
50+
WANTED_CARGO_VER=${WANTED_CARGO_VER:-"cargo 1.82.0 (* 2024-08-21)"}
51+
WANTED_RUSTFMT_VER=${WANTED_RUSTFMT_VER:-"rustfmt 1.7.1-stable (* 2024-10-15)"}
52+
WANTED_CLIPPY_VER=${WANTED_CLIPPY_VER:-"clippy 0.1.82 (* 2024-10-15)"}
5353
CARGO="cargo"
5454
CARGO_MODE="system"
5555

0 commit comments

Comments
 (0)