Skip to content

Commit b64df9d

Browse files
committed
Auto merge of #149265 - lnicola:sync-from-ra, r=lnicola
`rust-analyzer` subtree update Subtree update of `rust-analyzer` to rust-lang/rust-analyzer@cf4b1fa. Created using https://github.com/rust-lang/josh-sync. r? `@ghost`
2 parents 42ec52b + 87e4974 commit b64df9d

File tree

243 files changed

+13259
-7128
lines changed

Some content is hidden

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

243 files changed

+13259
-7128
lines changed

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ env:
1616
CI: 1
1717
RUST_BACKTRACE: short
1818
RUSTUP_MAX_RETRIES: 10
19+
RUSTFLAGS: "-D warnings -W unreachable-pub --cfg no_salsa_async_drops"
1920

2021
defaults:
2122
run:
@@ -41,8 +42,6 @@ jobs:
4142
if: github.repository == 'rust-lang/rust-analyzer'
4243
name: proc-macro-srv
4344
runs-on: ubuntu-latest
44-
env:
45-
RUSTFLAGS: "-D warnings"
4645

4746
steps:
4847
- name: Checkout repository
@@ -80,7 +79,6 @@ jobs:
8079
name: Rust
8180
runs-on: ${{ matrix.os }}
8281
env:
83-
RUSTFLAGS: "-Dwarnings"
8482
CC: deny_c
8583

8684
strategy:
@@ -207,8 +205,6 @@ jobs:
207205
# crate should
208206
- target: wasm32-unknown-unknown
209207
ide-only: true
210-
env:
211-
RUSTFLAGS: "-Dwarnings"
212208

213209
steps:
214210
- name: Checkout repository

src/tools/rust-analyzer/.github/workflows/metrics.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
env:
88
CARGO_INCREMENTAL: 0
99
CARGO_NET_RETRY: 10
10-
RUSTFLAGS: "-D warnings -W unreachable-pub"
10+
RUSTFLAGS: "-D warnings -W unreachable-pub --cfg no_salsa_async_drops"
1111
RUSTUP_MAX_RETRIES: 10
1212

1313
jobs:

src/tools/rust-analyzer/.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ jobs:
140140
if: matrix.target == 'x86_64-unknown-linux-gnu'
141141
env:
142142
RUSTC_BOOTSTRAP: 1
143-
run: target/${{ matrix.target }}/release/rust-analyzer analysis-stats --with-deps $(rustc --print sysroot)/lib/rustlib/src/rust/library/std -q
143+
run: target/${{ matrix.target }}/release/rust-analyzer analysis-stats --with-deps --no-sysroot --no-test $(rustc --print sysroot)/lib/rustlib/src/rust/library/std -q
144144

145145
- name: Upload artifacts
146146
uses: actions/upload-artifact@v4

0 commit comments

Comments
 (0)