Subtree update of `rust-analyzer` #118365

lnicola · 2023-11-27T10:43:00Z

No description provided.

Co-authored-by: Lukas Wirth <[email protected]>

…m-ra

internal: Sync from downstream

internal: Remove debugging code in path resolution Closes rust-lang#15924

Fix typo in highlight_related.rs While reading the user manual, I noticed a random tick, so I went ahead and fixed it. The `await` keyword should be properly rendered as inline code. ![image](https://github.com/rust-lang/rust-analyzer/assets/20878432/f134a4c9-e539-4635-97ac-506790893869)

…=lnicola fix: handle default constant values in `trait_impl_missing_assoc_item` diagnostic A patch of rust-lang/rust-analyzer#15895, close rust-lang/rust-analyzer#15909 cc `@Veykril`

ensure renames happen after edit This is a bugfix for an issue I fould while working on helix. Rust-analyzer currently always sends any filesystem edits (rename/file creation) before any other edits. When renaming a file that is also being edited that would mean that the edit would be discarded and therefore an incomplete/incorrect refactor (or even cause the creation of a new file in helix altough that is probably a pub on our side). Example: * create a module: `mod foo` containing a `pub sturct Bar;` * reexport the struct uneder a different name in the `foo` module using a *fully qualified path*: `pub use crate::foo::Bar as Bar2`. * rename the `foo` module to `foo2` using rust-analyzer * obsereve that the path is not correctly updated (rust-analyer first sends a rename `foo.rs` to `foo2.rs` and then edits `foo.rs` after) This PR fixes that issue by simply executing all rename operations after all edit operations (while still executing file creation operations first). I also added a testcase similar to the example above. Relevent excerpt from the LSP standard: > Since version 3.13.0 a workspace edit can contain resource operations (create, delete or rename files and folders) as well. If resource operations are present clients need to execute the operations in the order in which they are provided. So a workspace edit for example can consist of the following two changes: (1) create file a.txt and (2) a text document edit which insert text into file a.txt. An invalid sequence (e.g. (1) delete file a.txt and (2) insert text into file a.txt) will cause failure of the operation. How the client recovers from the failure is described by the client capability: workspace.workspaceEdit.failureHandling

fix: better resolve assoc item with type bound Closes rust-lang#15772

Update Arch Linux package URL in manual.adoc The old URL returns 404 now.

chore: add use case for `PathSegment::qualifying_trait` add use case for `PathSegment::qualifying_trait`, which introduced in rust-lang/rust-analyzer#15875

This commit provides additional initialization methods to Connection in order to support CTRL + C sigterm handling.

…ion, r=Veykril Cancelable Initialization This commit provides additional initialization methods to Connection in order to support CTRL + C sigterm handling. In the process of adding LSP to Nushell (see nushell/nushell#10941) this gap has been identified.

Partially fixes rust-lang#15656 . When a crate graph is extended which is the case when new workspaces are added to the project the rules for deduplication were too strict. One problem that arises from this is that in certain conditions when we see the same crate having different `CrateOrigin`s the first form would be maintained. This approach however results in some unwanted results such as making renaming forbidden as this has been recently only made available for local crates. The given example in rust-lang#15656 can still not be resolved with this PR as that involves taking inconsistencies between dependencies into consideration. This will be addressed in a future PR.

Make data reflect a case where dev deps are existent. base-db::CrateGraph::extend now adds dev dependencies for a crate in case of its upgrading from a CrateOrigin::Lib kind of a crate to a CrateOrigin::Local one.

…m-ra

rustbot · 2023-11-27T10:43:12Z

r? @Mark-Simulacrum

(rustbot has picked a reviewer for you, use r? to override)

rustbot · 2023-11-27T10:43:13Z

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 · 2023-11-27T10:43:19Z

@bors r+ p=1 subtree sync

bors · 2023-11-27T10:43:23Z

📌 Commit 0c96252 has been approved by lnicola

It is now in the queue for this repository.

lnicola · 2023-11-27T10:44:28Z

r? @ghost

rustbot · 2023-11-27T10:44:31Z

Failed to set assignee to ghost: invalid assignee

Note: Only org members with at least the repository "read" role, users with write permissions, or people who have commented on the PR may be assigned.

lnicola · 2023-11-27T10:50:21Z

@bors r-

rustbot · 2023-11-27T10:54:36Z

The list of allowed third-party dependencies may have been modified! You must ensure that any new dependencies have compatible licenses before merging.

cc @davidtwco, @wesleywiser

lnicola · 2023-11-27T10:54:57Z

@bors r+ p=1 subtree sync

bors · 2023-11-27T10:54:59Z

📌 Commit d036daa has been approved by lnicola

It is now in the queue for this repository.

bors · 2023-11-27T12:22:41Z

⌛ Testing commit d036daa with merge aa33051...

bors · 2023-11-27T14:53:49Z

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

rust-timer · 2023-11-28T03:18:58Z

Finished benchmarking commit (aa33051): 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

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)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-1.7%	[-2.0%, -1.4%]	2
All ❌✅ (primary)	-	-	0

Cycles

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

Binary size

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

Bootstrap: 675.168s -> 675.406s (0.04%)
Artifact size: 313.39 MiB -> 313.35 MiB (-0.01%)

jprochazk and others added 30 commits October 28, 2023 16:34

override language client

3e4de96

add configuration option

c566136

ensure renames happen after edit

0647b64

FIxed typo in highlight_related.rs

6705860

detect internal error via error.code instead of error message

0d147b3

Update editors/code/package.json

9c8727e

Co-authored-by: Lukas Wirth <[email protected]>

fix missing assoc item

cfc881a

fix: better resolve assoc item with type bound

e95ec55

Merge commit '141fc695dca1df7cfc3c9803972ec19bb178dcbc' into sync-fro…

59f5d51

…m-ra

Merge branch 'master' into sync-from-rust

6a0e02d

Auto merge of rust-lang#15917 - lnicola:sync-from-rust, r=lnicola

bc97821

internal: Sync from downstream

address comment

808f668

chore: add use case for PathSegment::qualifying_trait

1cbda61

Remove debugging code in path resolution

a54c0da

Auto merge of rust-lang#15925 - lnicola:pathres-nodebug, r=lnicola

255eed4

internal: Remove debugging code in path resolution Closes rust-lang#15924

Auto merge of rust-lang#15911 - Young-Flash:fix_missing_assoc_item, r…

1a5cee1

…=lnicola fix: handle default constant values in `trait_impl_missing_assoc_item` diagnostic A patch of rust-lang/rust-analyzer#15895, close rust-lang/rust-analyzer#15909 cc `@Veykril`

Auto merge of rust-lang#15825 - Austaras:master, r=flodiebold

8d3522e

fix: better resolve assoc item with type bound Closes rust-lang#15772

Update Arch Linux package URL in manual.adoc

9f8191b

Auto merge of rust-lang#15944 - brunobell:patch-1, r=lnicola

91b3148

Update Arch Linux package URL in manual.adoc The old URL returns 404 now.

Auto merge of rust-lang#15921 - Young-Flash:tmp, r=Veykril

4513651

chore: add use case for `PathSegment::qualifying_trait` add use case for `PathSegment::qualifying_trait`, which introduced in rust-lang/rust-analyzer#15875

Cancelable Initialization

81c2d35

This commit provides additional initialization methods to Connection in order to support CTRL + C sigterm handling.

v2

7e4aad5

v3

25e990d

Update test data for crate deduping

74d8fdc

Make data reflect a case where dev deps are existent. base-db::CrateGraph::extend now adds dev dependencies for a crate in case of its upgrading from a CrateOrigin::Lib kind of a crate to a CrateOrigin::Local one.

v3

f79e818

Make test cases simpler

736994f

Merge commit '237712fa314237e428e7ef2ab83b979f928a43a1' into sync-fro…

0c96252

…m-ra

rustbot assigned Mark-Simulacrum Nov 27, 2023

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 27, 2023

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 Nov 27, 2023

This comment has been minimized.

Sign in to view

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 27, 2023

Remove instant from EXCEPTIONS_RUST_ANALYZER

d036daa

rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Nov 27, 2023

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 27, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 27, 2023

bors merged commit aa33051 into rust-lang:master Nov 27, 2023
12 checks passed

rustbot added this to the 1.76.0 milestone Nov 27, 2023

lnicola deleted the sync-from-ra branch November 27, 2023 14:59

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Subtree update of `rust-analyzer` #118365

Subtree update of `rust-analyzer` #118365

lnicola commented Nov 27, 2023

rustbot commented Nov 27, 2023

rustbot commented Nov 27, 2023

lnicola commented Nov 27, 2023

bors commented Nov 27, 2023

lnicola commented Nov 27, 2023

rustbot commented Nov 27, 2023

This comment has been minimized.

lnicola commented Nov 27, 2023

rustbot commented Nov 27, 2023

lnicola commented Nov 27, 2023

bors commented Nov 27, 2023

bors commented Nov 27, 2023

bors commented Nov 27, 2023

rust-timer commented Nov 28, 2023

Subtree update of rust-analyzer #118365

Subtree update of rust-analyzer #118365

Conversation

lnicola commented Nov 27, 2023

rustbot commented Nov 27, 2023

rustbot commented Nov 27, 2023

lnicola commented Nov 27, 2023

bors commented Nov 27, 2023

lnicola commented Nov 27, 2023

rustbot commented Nov 27, 2023

This comment has been minimized.

lnicola commented Nov 27, 2023

rustbot commented Nov 27, 2023

lnicola commented Nov 27, 2023

bors commented Nov 27, 2023

bors commented Nov 27, 2023

bors commented Nov 27, 2023

rust-timer commented Nov 28, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Subtree update of `rust-analyzer` #118365

Subtree update of `rust-analyzer` #118365