Skip to content

Commit 81e7f7e

Browse files
authored
Merge pull request #1984 from rust-lang/rustc-pull
Rustc pull update
2 parents fd73ec5 + 7282804 commit 81e7f7e

653 files changed

Lines changed: 46949 additions & 21619 deletions

File tree

Some content is hidden

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

.github/workflows/ci.yaml

Lines changed: 7 additions & 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:
@@ -124,6 +122,12 @@ jobs:
124122
- name: Run tests
125123
run: cargo nextest run --no-fail-fast --hide-progress-bar --status-level fail
126124

125+
- name: Install cargo-machete
126+
uses: taiki-e/install-action@cargo-machete
127+
128+
- name: Run cargo-machete
129+
run: cargo machete
130+
127131
- name: Run Clippy
128132
if: matrix.os == 'macos-latest'
129133
run: cargo clippy --all-targets -- -D clippy::disallowed_macros -D clippy::dbg_macro -D clippy::todo -D clippy::print_stdout -D clippy::print_stderr
@@ -207,8 +211,6 @@ jobs:
207211
# crate should
208212
- target: wasm32-unknown-unknown
209213
ide-only: true
210-
env:
211-
RUSTFLAGS: "-Dwarnings"
212214

213215
steps:
214216
- name: Checkout repository

.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:

.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

.github/workflows/rustdoc.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ env:
88
CARGO_INCREMENTAL: 0
99
CARGO_NET_RETRY: 10
1010
RUSTFLAGS: "-D warnings -W unreachable-pub"
11+
RUSTDOCFLAGS: "-D warnings"
1112
RUSTUP_MAX_RETRIES: 10
1213

1314
jobs:

CONTRIBUTING.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
> [!IMPORTANT]
2+
> We have enacted a feature freeze for IDE assists to cope with the PR backlog as well as allowing us to prepare for the rowan transition!
3+
> If you submit a PR that **adds** new ide-assists, chances are very high that we will just close it on this basis alone until we have the capacity to deal with them again.
4+
5+
16
# Contributing to rust-analyzer
27

38
Thank you for your interest in contributing to rust-analyzer! There are many ways to contribute
@@ -28,3 +33,11 @@ possibility of someone putting a lot of work into a feature that is then going t
2833
it out of scope (be it due to generally not fitting in with rust-analyzer, or just not having the
2934
maintenance capacity). If there already is a feature issue open but it is not clear whether it is
3035
considered accepted feel free to just drop a comment and ask!
36+
37+
## Use of AI tools
38+
39+
AI tool use is not discouraged on the rust-analyzer codebase, as long as it meets our quality standards.
40+
We kindly ask you to disclose usage of AI tools in your contributions.
41+
If you used them without disclosing it, we may reject your contribution on that basis alone due to the assumption that you have, most likely, not reviewed your own submission (so why should we?).
42+
43+
We may still reject AI-assisted contributions if we deem the quality of the contribution to be unsatisfactory as to reduce impact on the team's review budget.

0 commit comments

Comments
 (0)