Skip to content

Subtree update of rust-analyzer #121931

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 91 commits into from
Mar 3, 2024
Merged

Subtree update of rust-analyzer #121931

merged 91 commits into from
Mar 3, 2024

Conversation

lnicola
Copy link
Member

@lnicola lnicola commented Mar 3, 2024

r? @ghost

Young-Flash and others added 30 commits February 21, 2024 18:07
`get_path_for_executable` will now first check `$CARGO_HOME` before falling back to searching `$PATH`.

rustup is the recommended way to manage rust toolchains, therefore should be picked before the
system toolchain.
…kril

Document nvim 0.10 `inlay_hint`

It took me a few hours to figure out how to enable inlay type hints on Nvim 0.10 with `lspconfig`. `rustaceanvim` has already dropped support for them (mrcjkb/rustaceanvim#46 (comment)) and most other plugins, like `rust-tools`, are depreciated in favor of `rustaceanvim`.

This PR documents how to enable the inlay hints on Neovim 0.10 and later. I've tested this and changing the `on_attach` function is the only step that is required.
…r=Veykril

Prioritise rustup sysroots over system ones

`get_path_for_executable` will now first check `$CARGO_HOME` before falling back to searching `$PATH`.

`rustup` is the recommended way to manage rust toolchains, therefore should be picked before the system toolchain.

Closes rust-lang#16661
…, r=Veykril

Merge `BorrowKind::Unique` into `BorrowKind::Mut`

Resolves rust-lang#15170
…xt_with_find_map, r=Veykril

fix: replace_filter_map_next_with_find_map shouldn't work for dyn trait

close rust-lang/rust-analyzer#16596
Narrow down typos ignores

- remove ignored files
- check dotfiles
- reorder config sections: files, regexp, words, IDs
- remove non-existent ignores
fix: Fix modules in blocks not resolving in ide layer

Fixes rust-lang/rust-analyzer#16511
internal: Remove salsa compile_fail tests

I can't figure out how to reproduce them, but hopefully fixes these:

![image](https://github.com/rust-lang/rust-analyzer/assets/308347/462dbfc3-5414-42fd-b81d-a3d699fa9a8d)
fix: panic when inlining callsites inside macros' parameters

Close rust-lang#16660, rust-lang#12429, rust-lang#10695.

When `inline_into_callers` encounters callsites in macros parameters, it can lead to panics. Since there is no perfect way to handle macros, this PR directly filters out these cases.
bors and others added 17 commits February 29, 2024 14:59
internal: Remove load-cargo dependency on ide

This lightens up the dep tree for projects using r-a as a library that do not need the ide crate itself.
Export `SemanticsImpl` from `ra_ap_hir` crate, since it's already exposed via `Semantics.deref()`

The `SemanticsImpl` type is already de-facto exposed via `<Semantics as Deref>::Target`.

By not being part of the public crate interface it however doesn't get included in the documentation, resulting in a massive blind spot when it comes to `ra_ap_hir`'s type resolution APIs.
fix: Don't highlight related assoc items of super traits
…ykril

fix: Ignore generic arguments in intra doc link path resolution

Fixes rust-lang/rust-analyzer#16699
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 3, 2024
@rustbot
Copy link
Collaborator

rustbot commented Mar 3, 2024

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 Mar 3, 2024

@bors r+ p=1 subtree sync

@bors
Copy link
Collaborator

bors commented Mar 3, 2024

📌 Commit 964e769 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 Mar 3, 2024
@bors
Copy link
Collaborator

bors commented Mar 3, 2024

⌛ Testing commit 964e769 with merge 1090205...

@bors
Copy link
Collaborator

bors commented Mar 3, 2024

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 3, 2024
@bors bors merged commit 1090205 into rust-lang:master Mar 3, 2024
@rustbot rustbot added this to the 1.78.0 milestone Mar 3, 2024
@lnicola lnicola deleted the sync-from-ra branch March 3, 2024 11:34
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (1090205): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

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

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

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

Cycles

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

Binary size

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

Bootstrap: 650.052s -> 648.889s (-0.18%)
Artifact size: 175.05 MiB -> 175.06 MiB (0.01%)

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.