Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 15e1006

Browse files
committedMay 21, 2024
Auto merge of #125202 - flip1995:clippy-subtree-update, r=Manishearth
Clippy subtree update r? `@Manishearth`
2 parents 5065123 + bb1481a commit 15e1006

File tree

124 files changed

+4025
-1120
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+4025
-1120
lines changed
 

‎src/tools/clippy/.github/driver.sh

+11-8
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,18 @@
22

33
set -ex
44

5+
sysroot="$(rustc --print sysroot)"
6+
case $OS in
7+
Linux) export LD_LIBRARY_PATH="$sysroot/lib" ;;
8+
macOS) export DYLD_FALLBACK_LIBRARY_PATH="$sysroot/lib" ;;
9+
Windows) export PATH="$(cygpath "$sysroot")/bin:$PATH" ;;
10+
*) exit 1
11+
esac
12+
513
# Check sysroot handling
6-
sysroot=$(./target/debug/clippy-driver --print sysroot)
7-
test "$sysroot" = "$(rustc --print sysroot)"
8-
9-
if [[ ${OS} == "Windows" ]]; then
10-
desired_sysroot=C:/tmp
11-
else
12-
desired_sysroot=/tmp
13-
fi
14+
test "$(./target/debug/clippy-driver --print sysroot)" = "$sysroot"
15+
16+
desired_sysroot="target/sysroot"
1417
# Set --sysroot in command line
1518
sysroot=$(./target/debug/clippy-driver --sysroot $desired_sysroot --print sysroot)
1619
test "$sysroot" = $desired_sysroot

‎src/tools/clippy/.github/workflows/clippy.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,6 @@ jobs:
6969
working-directory: clippy_dev
7070

7171
- name: Test clippy-driver
72-
run: |
73-
TOOLCHAIN=$(rustup show active-toolchain | cut -f1 -d' ')
74-
rustup run $TOOLCHAIN bash .github/driver.sh
72+
run: .github/driver.sh
73+
env:
74+
OS: ${{ runner.os }}

0 commit comments

Comments
 (0)