Rollup of 10 pull requests#103604

JohnTitor · 2022-10-26T23:31:00Z

Successful merges:

rustdoc: don't mark Box<T> as Iterator, Read, etc #103432 (rustdoc: don't mark Box as Iterator, Read, etc)
More dupe typos again #103526 (More dupe typos again)
rustdoc: combine shared CSS between .*-line-numbers #103537 (rustdoc: combine shared CSS between .*-line-numbers)
llvm-16: Don't initialize removed legacy passes #103549 (llvm-16: Don't initialize removed legacy passes)
Update cargo #103558 (Update cargo)
ptr::eq: clarify that comparing dyn Trait is fragile #103567 (ptr::eq: clarify that comparing dyn Trait is fragile)
⬆️ rust-analyzer #103579 (:arrow_up: rust-analyzer)
Fix typo in docs for guaranteed_ne #103580 (Fix typo in docs for guaranteed_ne)
thread::set_name: debug-assert that things went well #103596 (thread::set_name: debug-assert that things went well)
rustc_lexer::TokenKind improve docs #103598 (rustc_lexer::TokenKind improve docs)

Failed merges:

Migrate source line numbers CSS to CSS variables #103585 (Migrate source line numbers CSS to CSS variables)

r? @ghost
@rustbot modify labels: rollup

…re-pt2, r=Veykril Migrate assists to format args captures, part 2 Continuation of rust-lang#13379 Migrates: - `generate_constant` - `generate_default_from_enum_variant` - `generate_default_from_new` - `generate_delegate_methods` - `generate_deref` - `generate_documentation_template` - `generate_enum_is_method` - `generate_enum_projection_method` - `generate_from_impl_for_enum` - `generate_function` - `generate_getter` - `generate_impl` - `generate_new` - `generate_setter`

Substitute some VSCode variables in the VSCode client cc rust-lang/rust-analyzer#13405

Don't auto-publish lib crates I believe this should *just* work? With this cargo-workspaces should not consider them

Refactor language client handling Follow up to rust-lang/rust-analyzer#12847 (turns out they fixed parts of the problem) The PR will attempt to allow us to dispose more resources at will, so that we can implement restarts for the server properly instead of restating the entire extension as well as allowing us to implement a stop command. Closes rust-lang/rust-analyzer#12936 Closes rust-lang/rust-analyzer#4697

feat: Make flycheck workdone progress reports cancellable In clients that support this (like VSCode), the clients will now render a cancel button on the notification message which can be clicked to cancel the flycheck instead. Closes rust-lang/rust-analyzer#6895 ![Code_VbXgP3SbFD](https://user-images.githubusercontent.com/3757771/196205329-2df93451-c143-4d1b-a700-d988edf55efa.gif)

The reason for that was that we were calculating the crate defmaps of the file we are saving by accident causing us to get stuck waiting on their expensive computation, while we only need the relevant crate id.

fix: Fix formatting requests hanging when r-a is still starting The reason for that was that we were calculating the crate defmaps of the file we are saving by accident causing us to get stuck waiting on their expensive computation, while we only need the relevant crate id. Closes rust-lang/rust-analyzer#4054 Closes rust-lang/rust-analyzer#11654

…rator"

…eykril Revert "feat: Diagnose some incorrect usages of the question mark operator" Reverts rust-lang/rust-analyzer#13354 It seems like we are getting stuck with inference variables here, not just placeholders and errors so there is probably more wrong here that I don't understand. Reverting seems like the best solution right now as I don't have the time to look into this this week.

Simplify

Add some sysroot logging

Note that due to how cargo works, none of the modes currently work for r-a

Implement invocation strategy config Fixes rust-lang/rust-analyzer#10793 This allows to change how we run build scripts (and `checkOnSave`), exposing two configs: - `once`: run the specified command once in the project root (the working dir of the server) - `per_workspace`: run the specified command per workspace in the corresponding workspace This also applies to `checkOnSave` likewise, though `once_in_root` is useless there currently, due to rust-lang/cargo#11007

llvm-16: Don't initialize removed legacy passes LLVM removed initialization for legacy passes: https://reviews.llvm.org/D136615

Update cargo 5 commits in 071eeaf210708219a5a1b2c4728ca2f97df7f2ae..9210810d1fd7b51ae0439a0a363cc50e36963455 2022-10-22 01:17:55 +0000 to 2022-10-25 22:31:50 +0000 - Fix 410 gone response handling (rust-lang/cargo#11286) - Fix inequality in "stale mtime" log messages (rust-lang/cargo#11281) - doc(cargo-tree): mention it considering feature unification (rust-lang/cargo#11282) - Improve the error message if `publish` is `false` or empty list (rust-lang/cargo#11280) - Add test for deleted index entry (rust-lang/cargo#11278)

ptr::eq: clarify that comparing dyn Trait is fragile Also remove the dyn trait example from `ptr::eq` since those tests are not actually guaranteed to pass due to how unstable vtable comparison is. Cc ``@rust-lang/libs-api`` Cc discussion following rust-lang#80505

…r=lnicola ⬆️ rust-analyzer r? ``@ghost``

…umeGomez Fix typo in docs for `guaranteed_ne` `==` -> `!=`

thread::set_name: debug-assert that things went well r? `@cuviper`

rustc_lexer::TokenKind improve docs

JohnTitor · 2022-10-26T23:33:32Z

@bors r+ p=10 rollup=never

bors · 2022-10-26T23:33:34Z

📌 Commit 132883e has been approved by JohnTitor

It is now in the queue for this repository.

bors · 2022-10-26T23:58:28Z

⌛ Testing commit 132883e with merge df57f7b...

bors · 2022-10-27T03:15:24Z

☀️ Test successful - checks-actions
Approved by: JohnTitor
Pushing df57f7b to master...

rust-timer · 2022-10-27T03:18:14Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#103598	c6c1b700e1ba82c743352a8398f694daf81cb57f
#103596	3428b9dadf68c47d406c28ac3cfccbd50e5acd66
#103580	9cb9c0f4f72f50f3810ed4fe6eca017c5c4264fa
#103579	614ed1ec42a48fb4afca28adda6ce67be53f372a
#103567	41dce188684a4d86667edd2d39dc1d2f177b1193
#103558	90ff1ca5b3b1a5e3456d7d4911cf455f12fb460f
#103549	06ae1ae178654b4823e024cb535e9b82f4cbeb22
#103537	f91b12ac8cd3fabd82babfc6fa590de25bf24ca2
#103526	c4a340b6b037d844c475976d581d0895a605ba5e
#103432	31ba5fdeed6bd99b7a9f9f1ed73be68651ac7597

previous master: 1898c34e92

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

rust-timer · 2022-10-27T07:07:06Z

Finished benchmarking commit (df57f7b): 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)	5.6%	[5.6%, 5.6%]	1
Improvements ✅ (primary)	-3.1%	[-5.2%, -0.9%]	2
Improvements ✅ (secondary)	-6.6%	[-6.6%, -6.6%]	1
All ❌✅ (primary)	-3.1%	[-5.2%, -0.9%]	2

Cycles

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

the arithmetic mean of the percent change ↩
number of relevant changes ↩

jdm · 2022-10-27T23:07:01Z

I believe the commit messages from #103579 may have inadvertently closed older, unrelated Rust issues like #13442.

Rollup of 10 pull requests Successful merges: - rust-lang#103432 (rustdoc: don't mark Box<T> as Iterator, Read, etc) - rust-lang#103526 (More dupe typos again) - rust-lang#103537 (rustdoc: combine shared CSS between `.*-line-numbers`) - rust-lang#103549 (llvm-16: Don't initialize removed legacy passes) - rust-lang#103558 (Update cargo) - rust-lang#103567 (ptr::eq: clarify that comparing dyn Trait is fragile) - rust-lang#103579 (:arrow_up: rust-analyzer) - rust-lang#103580 (Fix typo in docs for `guaranteed_ne`) - rust-lang#103596 (thread::set_name: debug-assert that things went well) - rust-lang#103598 (rustc_lexer::TokenKind improve docs) Failed merges: - rust-lang#103585 (Migrate source line numbers CSS to CSS variables) r? `@ghost` `@rustbot` modify labels: rollup

Veykril and others added 30 commits September 27, 2022 18:22

Don't auto-publish lib crates

f310d4c

Migrate assists to format args captures, part 2

d7fb8d5

Substitute some VSCode variables in the VSCode client

d5f467a

Auto merge of rust-lang#13423 - Veykril:vscode-vars, r=Veykril

40cbeb5

Substitute some VSCode variables in the VSCode client cc rust-lang/rust-analyzer#13405

Auto merge of rust-lang#13302 - Veykril:auto-publish, r=Veykril

f079792

Don't auto-publish lib crates I believe this should *just* work? With this cargo-workspaces should not consider them

Refactor language client handling

6f43597

Properly reload changed configs for server start

8aaafdd

Make more things private

d68616a

Implement stop and start server commands

0421756

Downgrade vscode types dependency

7b5c943

Cleanup output channels

d63c44e

Make flycheck workdone progress reports cancellable

e41023c

fix: Fix formatting requests hanging when r-a is still starting

a762bac

The reason for that was that we were calculating the crate defmaps of the file we are saving by accident causing us to get stuck waiting on their expensive computation, while we only need the relevant crate id.

Revert "feat: Diagnose some incorrect usages of the question mark ope…

8047512

…rator"

Simplify

9d3e616

Auto merge of rust-lang#13439 - Veykril:simplify, r=Veykril

3392573

Simplify

Add some sysroot logging

653dafa

Auto merge of rust-lang#13441 - Veykril:sysroot-logging, r=Veykril

82ac6f7

Add some sysroot logging

Implement invocation strategy config for build scripts

7e2c41d

Implement invocation strategy config for checkOnSave

4a287d2

Note that due to how cargo works, none of the modes currently work for r-a

Use correct invocation strategy config for checkOnSave

5174b65

{manifest-path} interpolation

7db5029

Remove simplistic interpolation for manifest-path

4673236

Don't catch the server activation error

69b8456

Yuki Okushi added 7 commits October 27, 2022 08:30

Rollup merge of rust-lang#103549 - maurer:llvm-main, r=cuviper

6e1de0e

llvm-16: Don't initialize removed legacy passes LLVM removed initialization for legacy passes: https://reviews.llvm.org/D136615

Rollup merge of rust-lang#103579 - lnicola:rust-analyzer-2022-10-26, …

1d5f328

…r=lnicola ⬆️ rust-analyzer r? ``@ghost``

Rollup merge of rust-lang#103580 - lukas-code:guaranteed_ne, r=Guilla…

77145c0

…umeGomez Fix typo in docs for `guaranteed_ne` `==` -> `!=`

Rollup merge of rust-lang#103596 - RalfJung:thread-setname, r=cuviper

b4b3ff4

thread::set_name: debug-assert that things went well r? `@cuviper`

Rollup merge of rust-lang#103598 - tshepang:token-kind-docs, r=jackh726

132883e

rustc_lexer::TokenKind improve docs

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 26, 2022

bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 27, 2022

bors merged commit df57f7b into rust-lang:master Oct 27, 2022

rustbot added this to the 1.66.0 milestone Oct 27, 2022

bors mentioned this pull request Oct 27, 2022

Merge crossbeam-channel into std::sync::mpsc #93563

Merged

JohnTitor deleted the rollup-q4ns2gh branch October 27, 2022 03:23

This was referenced Oct 27, 2022

Rollup of 6 pull requests #103483

Closed

Migrate source line numbers CSS to CSS variables #103585

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 10 pull requests#103604