Skip to content

Subtree update of rust-analyzer #143565

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 63 commits into from
Jul 7, 2025
Merged

Subtree update of rust-analyzer #143565

merged 63 commits into from
Jul 7, 2025

Conversation

@lnicola
Copy link
Member

@lnicola lnicola commented Jul 7, 2025

r? @ghost

jnyfah and others added 30 commits June 18, 2025 02:25
@jnyfah
format function
d02f6f2
@jnyfah
fix format
8949360
@jnyfah
undo
174ec77
@jnyfah
revert changes
fdc49e1
@jnyfah
format
e9d080e
@Veykril
Workaround missing none group support in builtin macros
ba7bdc9
@A4-Tacks
Add AsMut Borrow BorrowMut to minicore and famous_defs
7ddab22
@Hmikihiro
Migrate replace_is_method_with_if_let_method Assist to use `SyntaxF…
6a52b3a 
…actory`

Signed-off-by: Hayashi Mikihiro <[email protected]>
@Hmikihiro
remove if-let chains
64d3647 
Signed-off-by: Hayashi Mikihiro <[email protected]>
@lnicola
Merge pull request rust-lang#20134 from Hmikihiro/migrate-replace_is_…
f38da2f 
…method_with_if_let_method-to-SyntaxFactory

Migrate `replace_is_method_with_if_let_method` Assist to use `SyntaxFactory`
@Hmikihiro
Migrate promote_local_to_const Assist to SyntaxEditor
61825a6 
Signed-off-by: Hayashi Mikihiro <[email protected]>
@lnicola
Merge pull request rust-lang#20135 from Hmikihiro/migrate-promote_loc…
070b8e2 
…al_to_const-assist-tosyntaxeditor

Migrate `promote_local_to_const` Assist to `SyntaxEditor`
@Hmikihiro
Migrate toggle_macro_delimiter assist to SyntaxEditor
aed886c 
Signed-off-by: Hayashi Mikihiro <[email protected]>
@lnicola
Merge pull request rust-lang#20136 from Hmikihiro/migrate-toggle_macr…
47687a4 
…o_delimiter

Migrate `toggle_macro_delimiter` Assist to use `SyntaxEditor`
@Hmikihiro
Migrate wrap_unwrap_cfg_attr assist to use SyntaxEditor
6f1369b 
Signed-off-by: Hayashi Mikihiro <[email protected]>
@lnicola
Merge pull request rust-lang#20137 from Hmikihiro/migrate-wrap_unwrap…
42e9a9f 
…_cfg_attr-assist-to-syntaxeditor

Migrate `wrap_unwrap_cfg_attr` Assist to use `SyntaxEditor`
@A4-Tacks
Fix AsMut::as_mut name
625b73b
@ShoyuVanilla
fix: Honor rust-analyzer.cargo.noDeps option when fetching sysroot …
4cfc341 
…metadata
@ChayimFriedman2
Remove keyword prefixes (macro@ or macro ) from links in the docs…
51ef8fb 
… only if the link target is inferred

That is, do it for `[macro foo]`, but not for `[macro foo](macro foo)`.
@Veykril
Merge pull request rust-lang#20151 from ChayimFriedman2/keyword-hover…
c6a805c 
…-link

fix: Remove keyword prefixes (`macro@` or `macro `) from links in the docs only if the link target is inferred
@Veykril
Restructure proc-macro loading erros, differentiate hard error proper…
adcb38c 
…ty on kind
@Veykril
Merge pull request rust-lang#20156 from Veykril/push-knkzxuxkzoyx
6dd8cfe 
Restructure proc-macro loading erros, differentiate hard error property on kind
@Veykril
Merge pull request rust-lang#20112 from Veykril/push-ruszuxrqzmvz
41c0d96 
Workaround missing none group support in builtin macros
@Veykril
Bump salsa
898f265
@Veykril
Merge pull request rust-lang#19923 from Veykril/push-rlrsyxsqnxnn
f98e4d0 
Bump salsa
@Veykril
Re-enable fixpoint iteration for variance computation
634dd22
@Veykril
Merge pull request rust-lang#20157 from Veykril/push-nxrvpywtvoys
60a65ec 
Re-enable fixpoint iteration for variance computation
@Veykril
fix: Do not warn about proc-macro srv when sysroot is missing
7e65c22
@Veykril
Merge pull request rust-lang#20158 from Veykril/push-rquozrwuskry
4a6bd40 
fix: Do not warn about proc-macro srv when sysroot is missing
@Veykril
Always couple --compile-time-deps with
ea88dbe 
`--all-targets` coupled with `--compile-time-deps` will never actually build binaries and so it won't fail for targets where libtest is missing
Veykril and others added 16 commits July 4, 2025 11:36
@Veykril
Skip unnecessary eq work in BodySourceMap
c49987f
@Veykril
Merge pull request rust-lang#20169 from Veykril/push-quvvsupnqqwv
3bfe103 
Skip unnecessary `eq` work in `BodySourceMap`
@Veykril
Improve flycheck and build script progress reporting
f3325a5
@lnicola
Merge pull request rust-lang#20170 from Veykril/push-vtsmzopsunsw
4b506ca 
Improve flycheck and build script progress reporting
@Wilfred
fix: Avoid .unwrap() when running the discover command
e779ea0 
Previously, the following configuration in settings.json:

    "rust-analyzer.workspace.discoverConfig": {
        "command": [
            "oops",
            "develop-json",
            "{arg}"
        ],
        "progressLabel": "rust-analyzer",
        "filesToWatch": [
            "BUCK",
            "TARGETS"
        ]
    },

Would previously cause a crash in rust-analyzer:

    thread 'LspServer' panicked at crates/rust-analyzer/src/main_loop.rs:776:84:
    called `Result::unwrap()` on an `Err` value: Os { code: 2, kind: NotFound, message: "No such file or directory" }

Instead, use more specific panic messages.
@vxpm
remove syntaxTree from docs
babbafb
@dianne
hir_ty::match_check: remove special handling for box patterns
26fd40e
@A4-Tacks
Fix Borrow and BorrowMut define from beta std
1d7fde3
@ChayimFriedman2
Fix diverging destructuring assignments
4aa30b5 
They need to return `!`, unlike diverging ordinary assignments. See the comment in the code.
@ChayimFriedman2
Merge pull request rust-lang#20172 from vxpm/syntax-tree-extension
f523843 
remove `rust-analyzer/syntaxTree` from docs
@ChayimFriedman2
Merge pull request rust-lang#20175 from dianne/match-check-box-cleanup
7fb07c9 
`hir_ty::match_check` cleanup: remove special handling for box patterns
@Veykril
Merge pull request rust-lang#20179 from ChayimFriedman2/destructuring…
bc10a25 
…-assignment-never

fix: Fix diverging destructuring assignments
@Veykril
Merge pull request rust-lang#20126 from Wilfred/no_unwrap_in_discover…
37f2263 
…_projects

fix: Avoid .unwrap() when running the discover command
@Veykril
Merge pull request rust-lang#20132 from A4-Tacks/asmut-borrow-minicore
eca5905 
Add AsMut, Borrow and BorrowMut to minicore and famous_defs
@Veykril
chore: Remove dead field from InferenceContext
836e0cb
@Veykril
Merge pull request rust-lang#20184 from Veykril/push-ywpynxnltpok
1cf9a7b 
chore: Remove dead field from `InferenceContext`
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 7, 2025
@rustbot
Copy link
Collaborator

rustbot commented Jul 7, 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 Jul 7, 2025

@bors r+ p=1 subtree sync

@bors
Copy link
Collaborator

bors commented Jul 7, 2025

📌 Commit 1cf9a7b 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 Jul 7, 2025
@bors
Copy link
Collaborator

bors commented Jul 7, 2025

⌛ Testing commit 1cf9a7b with merge 8df4a58...

@bors
Copy link
Collaborator

bors commented Jul 7, 2025

☀️ Test successful - checks-actions
Approved by: lnicola
Pushing 8df4a58 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 7, 2025
@bors bors merged commit 8df4a58 into rust-lang:master Jul 7, 2025
12 checks passed
@rustbot rustbot added this to the 1.90.0 milestone Jul 7, 2025
@lnicola lnicola deleted the sync-from-ra branch July 7, 2025 11:16
@github-actions
Copy link
Contributor

github-actions bot commented Jul 7, 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 c720f49 (parent) -> 8df4a58 (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 8df4a58ac47b778b093652d6190a6f9d54638774 --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. x86_64-apple-1: 5443.5s -> 8087.1s (48.6%)
  2. dist-aarch64-apple: 4743.0s -> 6113.7s (28.9%)
  3. x86_64-apple-2: 4023.2s -> 4949.3s (23.0%)
  4. pr-check-2: 2519.6s -> 2132.3s (-15.4%)
  5. dist-apple-various: 7780.2s -> 6610.5s (-15.0%)
  6. dist-s390x-linux: 4419.7s -> 4879.1s (10.4%)
  7. x86_64-gnu-aux: 6473.6s -> 5924.2s (-8.5%)
  8. pr-check-1: 1573.0s -> 1460.1s (-7.2%)
  9. dist-i686-mingw: 7842.0s -> 8355.1s (6.5%)
  10. dist-i586-gnu-i586-i686-musl: 5205.0s -> 5511.4s (5.9%)
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

rust-timer commented Jul 7, 2025

Finished benchmarking commit (8df4a58): comparison URL.

Overall result: ❌✅ regressions and improvements - no action needed

@rustbot label: -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

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

Max RSS (memory usage)

Results (secondary -1.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)		 2.1% [2.1%, 2.1%] 1
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -3.2% [-5.0%, -2.2%] 3
All ❌✅ (primary) - - 0

Cycles

Results (primary 2.3%, secondary 2.1%)

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

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

Binary size

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

Bootstrap: 464.259s -> 466.974s (0.58%)
Artifact size: 372.10 MiB -> 372.15 MiB (0.01%)

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

Reviewers

No reviews

Assignees

No one assigned

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

Milestone

1.90.0

Development

Successfully merging this pull request may close these issues.