Rollup of 9 pull requests #104236

compiler-errors · 2022-11-10T05:53:39Z

Successful merges:

Some diagnostic-related nits #102763 (Some diagnostic-related nits)
Parser: Recover from using colon as path separator in imports #103443 (Parser: Recover from using colon as path separator in imports)
remove redundent "<>" for ty::Slice with reference type #103675 (remove redundent "<>" for ty::Slice with reference type)
bootstrap: add support for running Miri on a file #104046 (bootstrap: add support for running Miri on a file)
Migrate crate-search element to CSS variables #104115 (Migrate crate-search element to CSS variables)
Ignore "Change InferCtxtBuilder from enter to build" in git blame #104190 (Ignore "Change InferCtxtBuilder from enter to build" in git blame)
Add check in GUI test for file loading failure #104201 (Add check in GUI test for file loading failure)
⬆️ rust-analyzer #104211 (:arrow_up: rust-analyzer)
Update mailmap #104231 (Update mailmap)

Failed merges:

Migrate :target rules to use CSS variables #104169 (Migrate :target rules to use CSS variables)

r? @ghost
@rustbot modify labels: rollup

fix: remove unused import

fix) update broken links in guide.md Hi, I Just fixed some broken links in `guide.md`. In most cases, it is not connected by an old version (expecially `guide-2019-01`) of the link, so I made some modifications. Thanks for your time :)

…=lnicola fix: disregard type variable expectation for if expressions Fixes rust-lang#13522 As [the comment](https://github.com/rust-lang/rust-analyzer/blob/8142d1f606dc2e52b1d2b8992671e2bd73379f28/crates/hir-ty/src/infer.rs#L1087-L1090) on `Expectation::adjust_for_branches` explains: > If the expected type is just a type variable, then don't use an expected type. Otherwise, we might write parts of the type when checking the 'then' block which are incompatible with the 'else' branch. Note that we already use it in match expressions. I've added tests for them too nevertheless.

This reverts commit 319611b.

…assist, r=jonas-schievink Add `Convert match to let-else` assist Closes rust-lang/rust-analyzer#13254

fix: async trait method for `unnecessary_async` Fix rust-lang/rust-analyzer#13492

…e, r=jonas-schievink feat: show signature help when calling generic types implementing `FnOnce` This queries chalk for the `FnOnce` impl of callees and takes argument and return types from there, making generic `Callable`s available to the IDE. This makes signature help work for them, and potentially allows other features to take generic callables into account in the future.

fix: make custom expr prefix completions to understand refs Possible fix of rust-lang#7929 While reviewing the postfix completion code I saw that while calling `add_custom_postfix_completions` we were doing it under the part where reference was not taken into consideration, but as we are only adding postfix completions with `Expr` scope ( [source](https://github.com/rust-lang/rust-analyzer/blob/ba28e19b7838e3ad4223ae82d074dc3950ef1548/crates/ide-completion/src/completions/postfix.rs#L272) ) I shifted the `add_custom_postfix_completions` call to part where references are considered I am not sure if this is the correct fix or I am understanding the problem exactly but this small move seemed to have fixed the issue :)

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

…kril feat: add config for inserting must_use in `generate_enum_as_method` Should fix rust-lang#13312 Didn't add a test because I was not sure on how to add test for a specific configuration option, tried to look for the usages for other `AssistConfig` variants but couldn't find any in `tests`. If there is a way to test this, do point me towards it. I tried to extract the formatting string as a common `template_string` and only have if-else for that, but it didn't compile :( Also it seems these tests are failing: ``` test config::tests::generate_config_documentation ... FAILED test config::tests::generate_package_json_config ... FAILED ``` Can you also point me to how to correct these 😅 ( I guess there is some command to automatically generate these? )

…o-guarded-return-assist, r=jonas-schievink Use let-else statements in `Convert to guarded return` assist Follow up for rust-lang/rust-analyzer#13516, addresses remaining part of rust-lang/rust-analyzer#13254 (comment)

compiler-errors · 2022-11-10T05:53:59Z

@bors r+ rollup=never p=9

bors · 2022-11-10T05:54:00Z

📌 Commit 609bea9 has been approved by compiler-errors

It is now in the queue for this repository.

bors · 2022-11-10T08:13:56Z

⌛ Testing commit 609bea9 with merge 296e8d45d3d6bfd31df7d7bef5f0dba37297eb97...

bors · 2022-11-10T12:28:57Z

💥 Test timed out

Dylan-DPC · 2022-11-10T12:44:17Z

@bors retry

rust-log-analyzer · 2022-11-10T12:48:34Z

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

bors · 2022-11-10T13:05:03Z

⌛ Testing commit 609bea9 with merge 01a6f30...

bors · 2022-11-10T15:45:50Z

☀️ Test successful - checks-actions
Approved by: compiler-errors
Pushing 01a6f30 to master...

rust-timer · 2022-11-10T15:48:29Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#104231	ab822a7ae3e547355d0403466cb4030d8d4ec36d
#104211	54e697ee72c266f48c281e9ec025d06b02c3efae
#104201	d6ed466e14095ccab4b01b8adca1df2f848fcd56
#104190	9407b79ee35608b4d13dba6a00525513f0518bdc
#104115	3cc032a57079ff7c34f9968d44a20c21c6b4a2d6
#104046	c6190c50dbceb31e8751ed0d7234755b44ab24b5
#103675	3d87228da4daf5becbcd73c411a076b8b40e7210
#103443	bdc554ef2f65c8c5b911684efacfcb4136952227
#102763	c974c2a2fb32ce6558c498b652b4f591dcfe7b16

previous master: 11fa0850f0

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-11-10T17:04:32Z

Finished benchmarking commit (01a6f30): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.3%	[-0.4%, -0.2%]	21
Improvements ✅ (secondary)	-0.3%	[-0.6%, -0.2%]	12
All ❌✅ (primary)	-0.3%	[-0.4%, -0.2%]	21

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)	2.1%	[2.1%, 2.1%]	1
Improvements ✅ (primary)	-2.2%	[-2.2%, -2.2%]	1
Improvements ✅ (secondary)	-2.1%	[-2.7%, -1.5%]	4
All ❌✅ (primary)	-2.2%	[-2.2%, -2.2%]	1

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

…mpiler-errors Rollup of 9 pull requests Successful merges: - rust-lang#102763 (Some diagnostic-related nits) - rust-lang#103443 (Parser: Recover from using colon as path separator in imports) - rust-lang#103675 (remove redundent "<>" for ty::Slice with reference type) - rust-lang#104046 (bootstrap: add support for running Miri on a file) - rust-lang#104115 (Migrate crate-search element to CSS variables) - rust-lang#104190 (Ignore "Change InferCtxtBuilder from enter to build" in git blame) - rust-lang#104201 (Add check in GUI test for file loading failure) - rust-lang#104211 (:arrow_up: rust-analyzer) - rust-lang#104231 (Update mailmap) Failed merges: - rust-lang#104169 (Migrate `:target` rules to use CSS variables) r? `@ghost` `@rustbot` modify labels: rollup

DropDemBits and others added 30 commits October 10, 2022 10:47

Migrate most of ide_assists::utils to format arg capture

0f46f27

Migrate assists to format args captures, part 1

d439fb2

Migrate assists to format args captures, part 3

b1909a8

fix broken links in guide.md

8ebc96a

addressed rust-lang/rust-analyzer#12536

e4ef0e5

ide: Generate monikers for local crates.

8039a07

feat: add config for inserting must_use in generate_enum_as_method

c4bdb8e

refactor: remove repetitive string interpolation and doc changes

4bf9b9b

fix: async trait method for unnecessary_async

4a7f5ca

Simplify the procedure

cf90e4f

fix: remove unused import

Record diverging match arms in InferenceResult

319611b

Add Convert match to let-else assist

48efc9d

Update auto generated tests

f0a1434

fix: make custom expr prefix completions to understand refs

98125b9

fix: disregard type variable expectation for if expressions

db8c752

Create Callables for generic types implementing FnOnce

ecad1a9

Import option in the tests

9f1bb17

Revert "Record diverging match arms in InferenceResult"

e110c78

This reverts commit 319611b.

Fix doc test

72d5b45

Auto merge of rust-lang#13516 - unexge:add-convert-match-to-let-else-…

d90cb1e

…assist, r=jonas-schievink Add `Convert match to let-else` assist Closes rust-lang/rust-analyzer#13254

Auto merge of rust-lang#13508 - koka831:fix/13492, r=jonas-schievink

a8e97bc

fix: async trait method for `unnecessary_async` Fix rust-lang/rust-analyzer#13492

Use let-else statements in Convert to guarded return assist

62a6cdf

fix: indentation after inserting #must_use

691ce30

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

Bump ovsx

adee109

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

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 10, 2022

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

bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 10, 2022

bors merged commit 01a6f30 into rust-lang:master Nov 10, 2022

rustbot added this to the 1.67.0 milestone Nov 10, 2022

This was referenced Nov 10, 2022

Print "Checking/Building ..." message even when --dry-run is passed #104078

Merged

Migrate :target rules to use CSS variables #104169

Merged

compiler-errors deleted the rollup-adjshd6 branch August 11, 2023 20:16

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 9 pull requests #104236

Rollup of 9 pull requests #104236

compiler-errors commented Nov 10, 2022

compiler-errors commented Nov 10, 2022

bors commented Nov 10, 2022

bors commented Nov 10, 2022

bors commented Nov 10, 2022

Dylan-DPC commented Nov 10, 2022

rust-log-analyzer commented Nov 10, 2022

bors commented Nov 10, 2022

bors commented Nov 10, 2022

rust-timer commented Nov 10, 2022

rust-timer commented Nov 10, 2022

Rollup of 9 pull requests #104236

Rollup of 9 pull requests #104236

Conversation

compiler-errors commented Nov 10, 2022

compiler-errors commented Nov 10, 2022

bors commented Nov 10, 2022

bors commented Nov 10, 2022

bors commented Nov 10, 2022

Dylan-DPC commented Nov 10, 2022

rust-log-analyzer commented Nov 10, 2022

bors commented Nov 10, 2022

bors commented Nov 10, 2022

rust-timer commented Nov 10, 2022

rust-timer commented Nov 10, 2022

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles