Skip to content
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

Subtree update of rust-analyzer #134681

Merged
merged 67 commits into from
Dec 23, 2024
Merged

Subtree update of rust-analyzer #134681

merged 67 commits into from
Dec 23, 2024

Conversation

lnicola
Copy link
Member

@lnicola lnicola commented Dec 23, 2024

r? @ghost

roife and others added 30 commits December 13, 2024 23:34
And also a bit of cleanup by storing the capture's span with the open quote included.
internal: Simplify ratoml testdir usage
feat: Report unresolved idents for implicit captures in `format_args!()`
minor: improve name suggestion for destructure_tuple_binding
…string

feat: Use string literal contents as a name when extracting into variable
internal: Don't serialize empty fields in completions and resolve payloads
…e-exports

Prior to this commit we used to generate import paths, then zipped them with the existing qualifier to check if they agree on the path to import.
This is brittle when re-exports come into play causing items to have multiple applicable paths that refer to them.
This commit instead rewrites this logic by generating the import path for the qualifier, verifying that the rest of the qualifier resolves and then doing a final lookup on that resolution result for the final segment instead.
fix: Fix path qualified auto-importing completions not working with re-exports
I found it easiest to fix in the quickfix code, and not deeper (e.g. body lowering).
The reason I did this is because I plan to add another field to this struct (indicating whether the item was cfg'ed out), but it seems worthy even separately and removes a bunch of one-letter variable names and tuple-indexing. It is also easy to separate from future changes, so it will be easier to review this way.
fix: Fix a panic with a diagnostics fix when a keyword is used as a field
It didn't print the `@`.
fix: Fix pretty-printing of `@` patterns
Remove salsa from proc-macro server dep tree
Taking a raw ref of a deref is always safe
internal: Cleanup label structure of `CompletionItem`
fix: Do not ask the client to resolve for non existing label details
fix: Consider both completion detail fields in to_proto
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 23, 2024
@rustbot
Copy link
Collaborator

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

@bors r+ =1 subtree sync

@bors
Copy link
Collaborator

bors commented Dec 23, 2024

📌 Commit 8dbdcc0 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 23, 2024
@lnicola
Copy link
Member Author

lnicola commented Dec 23, 2024

@bors r+ p=1

@bors
Copy link
Collaborator

bors commented Dec 23, 2024

💡 This pull request was already approved, no need to approve it again.

@bors
Copy link
Collaborator

bors commented Dec 23, 2024

📌 Commit 8dbdcc0 has been approved by lnicola

It is now in the queue for this repository.

@bors
Copy link
Collaborator

bors commented Dec 23, 2024

⌛ Testing commit 8dbdcc0 with merge 904d8f6...

@bors
Copy link
Collaborator

bors commented Dec 23, 2024

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 23, 2024
@bors bors merged commit 904d8f6 into rust-lang:master Dec 23, 2024
7 checks passed
@rustbot rustbot added this to the 1.85.0 milestone Dec 23, 2024
@lnicola lnicola deleted the sync-from-ra branch December 23, 2024 16:18
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (904d8f6): 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 0.3%)

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)
3.8% [3.8%, 3.8%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-3.1% [-3.1%, -3.1%] 1
All ❌✅ (primary) - - 0

Cycles

Results (primary 4.5%, secondary -3.0%)

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)
4.5% [0.9%, 7.7%] 9
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-3.0% [-4.2%, -2.0%] 8
All ❌✅ (primary) 4.5% [0.9%, 7.7%] 9

Binary size

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

Bootstrap: 763.753s -> 763.12s (-0.08%)
Artifact size: 330.55 MiB -> 330.55 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants