Skip to content

Subtree update of rust-analyzer #142907

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 43 commits into from
Jun 23, 2025
Merged

Subtree update of rust-analyzer #142907

merged 43 commits into from
Jun 23, 2025

Conversation

lnicola
Copy link
Member

@lnicola lnicola commented Jun 23, 2025

r? @ghost

ChayimFriedman2 and others added 30 commits June 6, 2025 16:34
…hen possible

But default to not to.

I chose to have a more generic config name because maybe other assists could also use the same approach.
…private-field diagnostic (previously it was only on no-such-field)

The difference between the diagnostics is that no-such-field is for record struct construction, while private-field is for dot syntax.

I tried to unify them, but there is a bit of uniqueness in each. This is possible but maybe not worth it.

Also, fix the quickfix when there is already a visibility to the field (replace it instead of appending to it).
feat: Show what cargo metadata is doing in status
feat: Insert required parentheses when typing `+` in dyn trait type
…-quickfix

feat: Add the quickfix for increasing visibility of a private field to the private-field diagnostic (previously it was only on no-such-field)
feat: In "Fill match arms", allow users to prefer `Self` to the enum name when possible
fix: Copy lockfiles into target directory before invoking `cargo metadata`
chore: Start infesting ide crates with 'db lifetime
fix: Reload workspaces when cargo configs change
We show fixes now even for experimental diagnostics anyway, and it has false positives.
…-exp

fix: Never make type mismatch diagnostic stable, even when there is a fix
Improve completions in if / while expression conditions
…s_without_pe

Hide imported privates if private editable is disabled
This reverts commit 8643a858dbaf12b37e90b603cdee64434576c229.
Revert "Turn `BlockId` into a `#[salsa::tracked]`"
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 23, 2025
@rustbot
Copy link
Collaborator

rustbot commented Jun 23, 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

@lnicola
Copy link
Member Author

lnicola commented Jun 23, 2025

@bors r+ p=1 subtree sync

@bors
Copy link
Collaborator

bors commented Jun 23, 2025

📌 Commit 9a0434e 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 Jun 23, 2025
@bors
Copy link
Collaborator

bors commented Jun 23, 2025

⌛ Testing commit 9a0434e with merge 706f244...

@bors
Copy link
Collaborator

bors commented Jun 23, 2025

☀️ Test successful - checks-actions
Approved by: lnicola
Pushing 706f244 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 23, 2025
@bors bors merged commit 706f244 into rust-lang:master Jun 23, 2025
11 checks passed
@rustbot rustbot added this to the 1.90.0 milestone Jun 23, 2025
Copy link
Contributor

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 42245d3 (parent) -> 706f244 (this PR)

Test differences

No test diffs found

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 706f244db581212cabf2e619e0113d70999b2bbe --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-x86_64-apple: 8136.9s -> 11631.9s (43.0%)
  2. aarch64-apple: 5990.8s -> 3917.0s (-34.6%)
  3. x86_64-apple-1: 9679.7s -> 6583.5s (-32.0%)
  4. mingw-check-1: 1815.1s -> 1523.8s (-16.0%)
  5. dist-aarch64-apple: 7305.7s -> 6240.0s (-14.6%)
  6. x86_64-apple-2: 5544.2s -> 4938.9s (-10.9%)
  7. x86_64-gnu-llvm-20-1: 3616.8s -> 3266.1s (-9.7%)
  8. i686-gnu-2: 6097.6s -> 5511.3s (-9.6%)
  9. i686-gnu-1: 7968.0s -> 7213.0s (-9.5%)
  10. x86_64-gnu-miri: 5084.9s -> 4619.3s (-9.2%)
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.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (706f244): 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 (primary 1.4%, secondary 1.6%)

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

mean range count
Regressions ❌
(primary)
1.4% [1.0%, 1.8%] 3
Regressions ❌
(secondary)
1.6% [1.3%, 1.9%] 11
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 1.4% [1.0%, 1.8%] 3

Cycles

Results (primary 1.4%, secondary 2.9%)

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

mean range count
Regressions ❌
(primary)
1.4% [1.4%, 1.4%] 1
Regressions ❌
(secondary)
2.9% [1.9%, 6.4%] 9
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 1.4% [1.4%, 1.4%] 1

Binary size

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

Bootstrap: 688.878s -> 688.989s (0.02%)
Artifact size: 371.92 MiB -> 371.96 MiB (0.01%)

@lnicola lnicola deleted the sync-from-ra branch June 24, 2025 04:35
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.