Subtree update of `rust-analyzer` #131399

lnicola · 2024-10-08T11:43:13Z

…vmmx, r=davidbarsky internal: add tracing to project discovery and VFS loading With `"env RA_PROFILE=vfs_load|parallel_prime_caches|discover_command>500`, this results in the following output: ``` 21888ms discover_command 11627ms vfs_load @ total = 701 1503ms vfs_load @ total = 701 30211ms parallel_prime_caches ``` As a followup, I'd like to make hprof emit the information above as JSON.

feat: Index workspace symbols at startup rather than on the first symbol search. This will eliminate potential many-second delays when performing the first search, at the price of making cache priming (“Indexing N/M” in the VS Code status bar) take a little longer in total. Hopefully this additional time is insignificant because a typical session will involve at least one symbol search. Further improvement would be to do this as a separate parallel task (which will be beneficial if the workspace contains a small number of large crates), but that would require significant additional refactoring of the progress-reporting mechanism to understand multiple tasks per crate. Happy to tackle that in this PR if desired, but I thought I'd propose the minimal change first.

Require rust 1.81 rust-analyzer doesn't build on 1.80 because we use `#[expect(lint)]`: ``` error[E0658]: the `#[expect]` attribute is an experimental feature --> crates/hir-expand/src/prettify_macro_expansion_.rs:11:1 | 11 | #[expect(deprecated)] | ^^^^^^^^^^^^^^^^^^^^^ | = note: see issue rust-lang#54503 <rust-lang#54503> for more information ```

Previously, r-a would show an error if both fetch_workspaces_queue and discover_workspace_queue were empty. We're in this state at startup, so users would see an error if they'd configured discover_workspace_config. Instead, allow the fetch_workspaces_queue to have zero items if discover_workspace_config is set. Whilst we're here, prefer "failed to fetch" over "failed to discover", so the error message better reflects what this function is doing.

fix: Don't report a startup error when a discover command is configured Previously, r-a would show an error if both fetch_workspaces_queue and discover_workspace_queue were empty. We're in this state at startup, so users would see an error if they'd configured discover_workspace_config. Instead, allow the fetch_workspaces_queue to have zero items if discover_workspace_config is set. Whilst we're here, prefer "failed to fetch" over "failed to discover", so the error message better reflects what this function is doing.

…ppings

…be false to restart package-wide flycheck

…eykril minor: Stricter requirements for package wide flycheck Require the existence of a target and `check_workspace` to be false to restart package-wide flycheck. Fixes rust-lang#18194 , rust-lang#18104

…kril internal: Add `SyntaxFactory` to ease generating nodes with syntax mappings Part of [#15710](rust-lang/rust-analyzer#15710) Instead of requiring passing a `&mut SyntaxEditor` to every make constructor to generate mappings, we instead wrap that logic in `SyntaxFactory`, and afterwards add all the mappings to the `SyntaxEditor`. Includes an example of using `SyntaxEditor` & `SyntaxFactory` in the `extract_variable` assist.

…art-debug, r=Veykril Building before a debugging session was restarted # Background Resolves rust-lang#17901. It adds support for rebuilding after debugging a test was restarted. This means the test doesn't have to be aborted and manually re-ran again. # How this is tested First, all the Visual Studio Code extensions are loaded into an Extension Host window. Then, a sample test like below was ran and restarted to see if it was correctly rebuild. ```rust #[test] fn test_x() { assert_eq!("1.1.1", "1.1.0"); } ```

Update cc to 1.1.22 This version of `cc` contains [a fix](https://github.com/rust-lang/cc-rs/releases/tag/cc-v1.1.22) to prevent spurious rebuilds. Hopefully this should help avoid the CI issues rustc has been having.

…eykril Include buildfiles in VFS We subscribe to `textDocument/didSave` for `filesToWatch`, but the VFS doesn't contain those files. Before rust-lang/rust-analyzer#18105, this would bring down the server. Now, it's only a benign error logged: ``` ERROR notification handler failed handler=textDocument/didSave error=file not found: /foo/bar/TARGETS ``` It's benign, because we will also receive a `workspace/didChangeWatchedFiles` for the file which will invalidate and load it. Explicitly include the buildfiles in the VFS to prevent the handler from erroring.

Up to a trait implemented by another package, linking to $CARGO_HOME/registry/cache/index.crates.io-6f17d22bba15001f/

…ukqt, r=lnicola internal: allow overriding proc macro server in analysis-stats Needed this argument in order to profile the proc macro expansion server (c.f., [this Zulip conversation](https://rust-lang.zulipchat.com/#narrow/stream/185405-t-compiler.2Frust-analyzer/topic/.60macro_rules!.60-based.20macros.20for.20derives.2Fattributes/near/473466794)). I also took the opportunity to change the phrasing for `--proc-macro-srv`. Ran with `samply record ~/.cargo/bin/rust-analyzer analysis-stats --proc-macro-srv /Users/dbarsky/.cargo/bin/rust-analyzer-proc-macro-srv --parallel .` on rust-analyzer itself.

…mzqv, r=Veykril internal: remove `Default` from OpQueue `@Wilfred` and I were talking about `OpQueue` and we identified one symptom of its (relative) weirdness is that `last_op_result` returns a `T::default()`; not `Option<&T>`, which means it's not possible to distinguish between "the `OpQueue` hasn't run yet" and "the OpQueue ran, but didn't produce a result". This branch fixes that.

Fix: Handle block exprs as modules when finding their parents Fixes rust-lang#18187

…Veykril fix: Fix bootstrap error message being incorrect precedence ...

…nsions

…Veykril internal: Filter out opaque tokens in some IDE feature macro descensions

…nyyx, r=davidbarsky internal: add json `tracing` Layer for profiling startup On `buck2/integrations/rust-project`, this results in the following being printed: ```json {"name":"discover_command","elapsed_ms":18703} {"name":"parallel_prime_caches","elapsed_ms":0} {"name":"vfs_load","elapsed_ms":5895} {"name":"vfs_load","elapsed_ms":547} {"name":"parallel_prime_caches","elapsed_ms":23} {"name":"parallel_prime_caches","elapsed_ms":84} {"name":"parallel_prime_caches","elapsed_ms":5819} ```

Because damnit, it can crash r-a. Why do people make this stupid DFSes anyway (I get it, it's easier until it blows).

…lbasi Use external stack in borrowck DFS Because damnit, it can crash r-a. Why do people make this stupid DFSes anyway (I get it, it's easier until it blows). Fixes rust-lang#18223 (who thought DFS will be the problem).

internal: Use macos-13 runners and bump MACOSX_DEPLOYMENT_TARGET to 13.0 As Monterey seems to be EOL.

minor: Sync from downstream

rustbot · 2024-10-08T11:43:17Z

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 · 2024-10-08T12:01:41Z

@bors r+ p=1 subtree sync

bors · 2024-10-08T12:01:44Z

📌 Commit 84a16c4 has been approved by lnicola

It is now in the queue for this repository.

bors · 2024-10-08T12:43:22Z

⌛ Testing commit 84a16c4 with merge 68e4d96...

bors · 2024-10-08T15:21:01Z

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

rust-timer · 2024-10-08T16:39:31Z

Finished benchmarking commit (68e4d96): 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 (primary -1.7%, secondary -2.4%)

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)	-1.7%	[-1.7%, -1.7%]	1
Improvements ✅ (secondary)	-2.4%	[-3.4%, -1.5%]	2
All ❌✅ (primary)	-1.7%	[-1.7%, -1.7%]	1

Cycles

Results (primary 2.1%, secondary 2.9%)

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)	2.1%	[2.1%, 2.1%]	1
Regressions ❌ (secondary)	2.9%	[2.1%, 4.0%]	8
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	2.1%	[2.1%, 2.1%]	1

Binary size

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

Bootstrap: 776.389s -> 775.182s (-0.16%)
Artifact size: 329.57 MiB -> 329.46 MiB (-0.03%)

SomeoneToIgnore and others added 30 commits September 23, 2024 04:44

Prepare for omittiong parts of completion data that need to be resolved

008d513

Omit completion fields to be resolved later

cc2686c

Resolve completion items

ecae5a8

Less clones

b82c5ce

Fix the test

b24723a

Small fixes

536ac47

Changes for debug restarting

b204f48

internal: add tracing to project discovery and VFS loading

4e4f016

Prime caches for symbol search too.

83a371a

Require rust 1.81

6e4f572

Include buildfiles in vfs

75ca498

internal: Add SyntaxFactory to ease generating nodes with syntax ma…

b9a0502

…ppings

minor: Use SyntaxEditor in extract_variable

d6d1b4a

minor: Require both the existence of a target and check_workspace to …

99de851

…be false to restart package-wide flycheck

Auto merge of rust-lang#18197 - alibektas:buggy_flycheck_message, r=V…

5fcfd95

…eykril minor: Stricter requirements for package wide flycheck Require the existence of a target and `check_workspace` to be false to restart package-wide flycheck. Fixes rust-lang#18194 , rust-lang#18104

Update cc to 1.1.22

9114a49

Auto merge of rust-lang#18204 - ChrisDenton:cc, r=lnicola

235809d

Update cc to 1.1.22 This version of `cc` contains [a fix](https://github.com/rust-lang/cc-rs/releases/tag/cc-v1.1.22) to prevent spurious rebuilds. Hopefully this should help avoid the CI issues rustc has been having.

Update handlers.rs to handlers/requests.rs

99b2638

Fix ambiguity with CamelCase diagnostic messages

d8fb793

Rename object_safety to dyn_compatibility

7b757b3

Up to a trait implemented by another package, linking to $CARGO_HOME/registry/cache/index.crates.io-6f17d22bba15001f/

internal: allow overriding proc macro server in analysis-stats

490df54

davidbarsky and others added 17 commits September 30, 2024 10:12

internal: remove Default from OpQueue

d7440d7

Fix: Handle block exprs as modules when finding their parents

2064874

Auto merge of rust-lang#18206 - ShoyuVanilla:issue-18187, r=Veykril

00399ab

Fix: Handle block exprs as modules when finding their parents Fixes rust-lang#18187

fix: Fix bootstrap error message being incorrect

7f8bd7e

Auto merge of rust-lang#18219 - Veykril:veykril/push-ytnzuvtoswqz, r=…

b91eeae

…Veykril fix: Fix bootstrap error message being incorrect precedence ...

internal: Filter out opaque tokens in some of IDE feature macro desce…

0301368

…nsions

Auto merge of rust-lang#18234 - Veykril:veykril/push-vzynqtlxmrnl, r=…

fae34e0

…Veykril internal: Filter out opaque tokens in some IDE feature macro descensions

internal: add JSON formatting for hprof

a5a4d1a

Use external stack in borrowck DFS

0e96fd0

Because damnit, it can crash r-a. Why do people make this stupid DFSes anyway (I get it, it's easier until it blows).

Use macos-13 runners and bump MACOSX_DEPLOYMENT_TARGET

ac5361f

Auto merge of rust-lang#18266 - lnicola:macos-13, r=lnicola

76fc27a

internal: Use macos-13 runners and bump MACOSX_DEPLOYMENT_TARGET to 13.0 As Monterey seems to be EOL.

Preparing for merge from rust-lang/rust

537fb8d

Merge from rust-lang/rust

4316aff

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

84a16c4

minor: Sync from downstream

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 8, 2024

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 Oct 8, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 8, 2024

bors merged commit 68e4d96 into rust-lang:master Oct 8, 2024
7 checks passed

rustbot added this to the 1.83.0 milestone Oct 8, 2024

lnicola deleted the sync-from-ra branch October 8, 2024 15:48

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Subtree update of `rust-analyzer` #131399

Subtree update of `rust-analyzer` #131399

Uh oh!

lnicola commented Oct 8, 2024

Uh oh!

rustbot commented Oct 8, 2024

Uh oh!

lnicola commented Oct 8, 2024

Uh oh!

bors commented Oct 8, 2024

Uh oh!

bors commented Oct 8, 2024

Uh oh!

bors commented Oct 8, 2024

Uh oh!

Uh oh!

rust-timer commented Oct 8, 2024

Uh oh!

Uh oh!

Subtree update of rust-analyzer #131399

Subtree update of rust-analyzer #131399

Uh oh!

Conversation

lnicola commented Oct 8, 2024

Uh oh!

rustbot commented Oct 8, 2024

Uh oh!

lnicola commented Oct 8, 2024

Uh oh!

bors commented Oct 8, 2024

Uh oh!

bors commented Oct 8, 2024

Uh oh!

bors commented Oct 8, 2024

Uh oh!

Uh oh!

rust-timer commented Oct 8, 2024

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Uh oh!

Subtree update of `rust-analyzer` #131399

Subtree update of `rust-analyzer` #131399