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 b1575cb

Browse files
committedSep 18, 2023
Auto merge of #115927 - lnicola:sync-from-ra, r=lnicola
⬆️ `rust-analyzer` r? `@ghost`
2 parents cbcf9a5 + b18db7a commit b1575cb

File tree

195 files changed

+5763
-2740
lines changed

Some content is hidden

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

195 files changed

+5763
-2740
lines changed
 

‎src/tools/rust-analyzer/.cargo/config.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ lint = "clippy --all-targets -- -Aclippy::collapsible_if -Aclippy::needless_pass
88
linker = "rust-lld"
99

1010
[env]
11-
CARGO_WORKSPACE_DIR = { value = "", relative = true }
11+
CARGO_WORKSPACE_DIR = { value = "", relative = true }

‎src/tools/rust-analyzer/.github/workflows/ci.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,20 @@ jobs:
8686
- name: Test
8787
run: cargo test ${{ env.USE_SYSROOT_ABI }} -- --nocapture --quiet
8888

89+
- name: Switch to stable toolchain
90+
run: |
91+
rustup update --no-self-update stable
92+
rustup component add --toolchain stable rust-src
93+
rustup default stable
94+
8995
- name: Run analysis-stats on rust-analyzer
9096
if: matrix.os == 'ubuntu-latest'
9197
run: target/${{ matrix.target }}/debug/rust-analyzer analysis-stats .
9298

9399
- name: Run analysis-stats on rust std library
94100
if: matrix.os == 'ubuntu-latest'
101+
env:
102+
RUSTC_BOOTSTRAP: 1
95103
run: target/${{ matrix.target }}/debug/rust-analyzer analysis-stats --with-deps $(rustc --print sysroot)/lib/rustlib/src/rust/library/std
96104

97105
# Weird targets to catch non-portable code

0 commit comments

Comments
 (0)