Skip to content

Commit 4ae49cf

Browse files
authoredApr 11, 2025
Merge pull request #19281 from github/redsun82/rust-setup
Rust: refine `ql/test/setup.sh`
2 parents 472bfa2 + 8594048 commit 4ae49cf

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed
 

‎rust/ql/test/setup.sh

+5-4
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@ set -euo pipefail
55
# This script is run by the CI to set up the test environment for the Rust QL tests
66
# We run this as rustup is not meant to be run in parallel, and will this setup will be run by rust-analyzer in the
77
# parallel QL tests unless we do the setup prior to launching the tests.
8-
# We do this for each `rust-toolchain.toml` we use in the tests (and the root one in `rust`)
8+
# We do this for each `rust-toolchain.toml` we use in the tests (and the root one in `rust` last, so it becomes the
9+
# default).
910

1011
cd "$(dirname "$0")"
1112

12-
rustup install
13-
rustup component add rust-src
14-
1513
find . -name rust-toolchain.toml \
1614
-execdir rustup install \; \
1715
-execdir rustup component add rust-src \;
16+
17+
# no to install rust-src explicitly, it's listed in ql/rust/rust-toolchain.toml
18+
rustup install

0 commit comments

Comments
 (0)