Skip to content

Subtree update of rust-analyzer - #137173

Merged
bors merged 97 commits into
rust-lang:masterfrom
lnicola:sync-from-ra
Feb 18, 2025
Merged

Subtree update of rust-analyzer#137173
bors merged 97 commits into
rust-lang:masterfrom
lnicola:sync-from-ra

Conversation

@lnicola

Copy link
Copy Markdown
Member

alibektasand others added 30 commits February 3, 2025 12:14
I have no idea what the original writer of the code thought but the logic just seems backwards. We should not exclude a file/directory if it is equal to an include! This also meant that we had to add a `root == path` check so this stuff will actually work, which in turn meant excludes (of root files) no longer worked...
Also rename if to `rust-analyzer.files.exclude`, because it can exclude files as well.
Lifetimes are elided in function signatures, and inferred in bodies.
This require a pretty big modification, because this is a new kind of file: exists - but ignore it.
Not all patterns are mapped to Pats. As such, it was necessary to change
the ret type Option<PatId> to Option<ExprOrPatId>
This is not documented (and I discovered that from experimenting and looking at the compiler's source code), but cfg_attrs *on the same level* as the attribute macro should be processed before it is expanded. cfg_attrs *below* should not (and this is contrary to what happens with derive macros, where both should be processed).
Signed-off-by: Hayashi Mikihiro <34ttrweoewiwe28@gmail.com>
…e_module_adt
fix: if item exsits on module, resolve as module instead of type
Previously the receiver text was taken directly from the AST, which in macros is missing trivia, leading to corruption (or just unintended replacement of user code).
Now we upmap the range, and extract the original file text in it.
Bumps [esbuild](https://github.com/evanw/esbuild) from 0.18.12 to 0.25.0.
- [Release notes](https://github.com/evanw/esbuild/releases)
- [Changelog](https://github.com/evanw/esbuild/blob/main/CHANGELOG-2023.md)
- [Commits](evanw/esbuild@v0.18.12...v0.25.0)
---
updated-dependencies:
- dependency-name: esbuild
dependency-type: direct:development
...
Signed-off-by: dependabot[bot] <support@github.com>
Veykriland others added 18 commits February 16, 2025 13:18
fix: Stabilize sort order of `related_tests`
…match-arms
internal: Remove mutable syntax tree usages from `add_missing_match_arms` assist
fix: highlight `extern crate` in doc comments
And add a new diagnostic for non-`Fn` parenthesized generic args.
Path lowering started to look like a mess, with each function carrying additional parameters for the diagnostic callback (since paths can occur both in type and in expression/pattern position, and their diagnostic handling is different) and the segment index, for the diagnostics report. So I refactored it from stateless functions on `TyLoweringContext` into stateful struct, `PathLoweringContext`, that tracks the process of lowering a path from resolution til assoc types selection.
There were two mistakes: first, tests were sorted before test modules, and second, we re-sorted based on the name only, which cancelled the sort based on the kind.
…eric-args
feat: Refactor path lowering and serve a new path diagnostic
…_imports
Implement expand_glob_reexport assist
I was wrong on rust-lang#19127, I thought hir-def resolver is enough for them, but it turns out not because of paths like `<Enum>::Variant` and `Type::AssocThatIsEnum::Variant`.
fix: Fix detection of ref patterns for path patterns
@rustbotrustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 17, 2025
@rustbot

Copy link
Copy Markdown
Collaborator

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
Copy Markdown
MemberAuthor

@bors r+ p=1 subtree sync

@bors

bors commented Feb 17, 2025

Copy link
Copy Markdown
Collaborator

📌 Commit e08736d has been approved by lnicola

It is now in the queue for this repository.

@borsbors 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 Feb 17, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 18, 2025
…iaskrgr
Rollup of 9 pull requests
Successful merges:
- rust-lang#136959 (Simplify switch sources)
- rust-lang#137020 (Pass vendored sources from bootstrap to generate-copyright)
- rust-lang#137073 (boostrap: skip no_std targets in Std doc step)
- rust-lang#137165 (Use `tell` for `<File as Seek>::stream_position`)
- rust-lang#137166 (Update default loongarch code model in docs)
- rust-lang#137168 (correct comment)
- rust-lang#137169 (CI: rfl: move job forward to Linux v6.14-rc3)
- rust-lang#137170 (Allow configuring jemalloc per target)
- rust-lang#137173 (Subtree update of `rust-analyzer`)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit fc82903 into rust-lang:masterFeb 18, 2025
@rustbotrustbot added this to the 1.87.0 milestone Feb 18, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Feb 18, 2025
Rollup merge of rust-lang#137173 - lnicola:sync-from-ra, r=lnicola
Subtree update of `rust-analyzer`
r? `@ghost`
@lnicola
lnicola deleted the sync-from-ra branch February 18, 2025 05:49
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: 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.

19 participants

@lnicola@rustbot@bors@alibektas@ChayimFriedman2@ShoyuVanilla@eagr@jyn514@Hmikihiro@Austaras@Veykril@joshrotenberg@asuto15@gohome001@Wilfred@roife@darichey@programmerjake@PoignardAzur