Skip to content

Commit

Permalink
build: use rust stable for linting
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
tiagolobocastro committed Nov 21, 2024
1 parent d68d9f3 commit 222c86d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion nix/shell/rust.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ let

shellEnv = {
# Path to nightly Rust, needed for linter and style.
RUST_NIGHTLY_PATH = rustChannels.nightly;
# RUST_NIGHTLY_PATH = rustChannels.nightly;

# Path to debug output dir.
RUST_TARGET_DEBUG = "target/debug";
Expand Down
8 changes: 4 additions & 4 deletions scripts/rust-linter-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ fi
# rustfmt and clippy "2021-11-29".
# When upgrading Rust toolchain version, check 'cargo --version',
# 'cargo fmt --version', 'cargo clippy --version' and put them here.
RUST_TOOLCHAIN_VER="2024-10-30"
WANTED_CARGO_VER="cargo 1.84.0-nightly (* 2024-10-25)"
WANTED_RUSTFMT_VER="rustfmt 1.8.0-nightly (* 2024-10-29)"
WANTED_CLIPPY_VER="clippy 0.1.84 (* 2024-10-29)"
RUST_TOOLCHAIN_VER=${RUST_TOOLCHAIN_VER:-"1.82.0"}
WANTED_CARGO_VER=${WANTED_CARGO_VER:-"cargo 1.82.0 (* 2024-08-21)"}
WANTED_RUSTFMT_VER=${WANTED_RUSTFMT_VER:-"rustfmt 1.7.1-stable (* 2024-10-15)"}
WANTED_CLIPPY_VER=${WANTED_CLIPPY_VER:-"clippy 0.1.82 (* 2024-10-15)"}
CARGO="cargo"
CARGO_MODE="system"

Expand Down

0 comments on commit 222c86d

Please sign in to comment.