Skip to content

Conversation

@lnicola
Copy link
Member

@lnicola lnicola commented Dec 3, 2025

Subtree update of rust-analyzer to rust-lang/rust-analyzer@633cff2.

Created using https://github.com/rust-lang/josh-sync.

r? @ghost

ChayimFriedman2 and others added 18 commits December 1, 2025 01:51
We don't need it anymore; `ParamEnv` is enough.

A lot of code relied on getting the crate from the `TraitEnvironment`. Some had it readily available from other sources, some changed to take a new struct `ParamEnvAndCrate`.
rustdoc has a separate environment variable for banning warnings, so
set that in the GitHub action configuration.

rust-lang/cargo#8424 (comment)

Fix all the rustdoc warnings on unknown types or functions. I've
updated references wherever it's obvious, otherwise I've replaced the
rustdoc link with plain backticks.

There were also some cases where rustdoc links referred to private
APIs. I've disabled the rustdoc private API warning in those crates.
Previously, rust-analyzer would drop discover requests that arrived
before we'd finished processing the previous request.

Fix this by allowing multiple discover requests to be active. Keep
track of the number of discover operations for the quiescence check,
and keep the process handles until they terminate.
Now that there's a table of contents rendered in the left sidebar,
there doesn't seem to be much value in rendering a table of contents
on the page too.

The sidebar TOC was added in mdbook 0.5:
https://github.com/rust-lang/mdBook/blob/master/CHANGELOG.md#05-migration-guide
fix(spelling): underling -> underlying
minor: Use 'deferred task' terminology consistently
…uests

fix: Allow multiple discover operations
…display

minor: Introduce a type alias for `HirDisplay`'s `Result`
Example
---
```rust
fn main() {
    let x = &$0
}
```

**Before this PR**

```rust
fn main() {
    let x = &loop {
        $0
    }
}
```

**After this PR**

```rust
fn main() {
    let x = &loop {
        $0
    };
}
```
…t-semi

Fix nested expr missing semicolon in incomplete-let
@rustbot
Copy link
Collaborator

rustbot commented Dec 3, 2025

rust-analyzer is developed in its own repository. If possible, consider making this change to rust-lang/rust-analyzer instead.

cc @rust-lang/rust-analyzer

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-rust-analyzer Relevant to the rust-analyzer team, which will review and decide on the PR/issue. labels Dec 3, 2025
@lnicola
Copy link
Member Author

lnicola commented Dec 3, 2025

@bors r+ p=2 rollup=always

@bors
Copy link
Collaborator

bors commented Dec 3, 2025

📌 Commit 0e706a5 has been approved by lnicola

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 3, 2025
@bors
Copy link
Collaborator

bors commented Dec 4, 2025

⌛ Testing commit 0e706a5 with merge 556beb9...

@bors
Copy link
Collaborator

bors commented Dec 4, 2025

☀️ Test successful - checks-actions
Approved by: lnicola
Pushing 556beb9 to main...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 4, 2025
@bors bors merged commit 556beb9 into rust-lang:main Dec 4, 2025
12 checks passed
@rustbot rustbot added this to the 1.93.0 milestone Dec 4, 2025
@github-actions
Copy link
Contributor

github-actions bot commented Dec 4, 2025

What is this? This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 5325015 (parent) -> 556beb9 (this PR)

Test differences

Show 4 test diffs

4 doctest diffs were found. These are ignored, as they are noisy.

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 556beb9ec72360512d0294eb0855c92fb2c20c88 --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

  1. dist-apple-various: 5441.4s -> 3939.2s (-27.6%)
  2. aarch64-gnu-llvm-20-2: 2481.1s -> 2123.8s (-14.4%)
  3. pr-check-1: 1934.1s -> 1682.6s (-13.0%)
  4. x86_64-gnu-llvm-20: 2772.1s -> 2455.7s (-11.4%)
  5. x86_64-rust-for-linux: 2948.6s -> 2623.6s (-11.0%)
  6. dist-aarch64-apple: 7350.8s -> 8153.2s (+10.9%)
  7. x86_64-gnu-tools: 3728.5s -> 3322.0s (-10.9%)
  8. x86_64-gnu-gcc: 3365.8s -> 3001.9s (-10.8%)
  9. aarch64-gnu-debug: 4315.3s -> 3854.2s (-10.7%)
  10. i686-gnu-1: 8332.9s -> 7454.7s (-10.5%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

@lnicola lnicola deleted the sync-from-ra branch December 4, 2025 08:26
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (556beb9): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results (secondary 2.2%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
2.2% [2.2%, 2.2%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Cycles

Results (secondary 0.9%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
4.1% [4.1%, 4.1%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.3% [-2.3%, -2.3%] 1
All ❌✅ (primary) - - 0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 469.794s -> 468.789s (-0.21%)
Artifact size: 386.75 MiB -> 386.75 MiB (0.00%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-rust-analyzer Relevant to the rust-analyzer team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants