Rollup of 7 pull requests #117415

matthiaskrgr · 2023-10-30T20:03:41Z

Successful merges:

Detect when trait is implemented for type and suggest importing it #116862 (Detect when trait is implemented for type and suggest importing it)
Some diagnostics improvements of gen blocks #117389 (Some diagnostics improvements of gen blocks)
Don't treat closures/coroutine types as part of the public API #117396 (Don't treat closures/coroutine types as part of the public API)
Correctly handle nested or-patterns in exhaustiveness #117398 (Correctly handle nested or-patterns in exhaustiveness)
Poison check_well_formed if method receivers are invalid to prevent typeck from running on it #117403 (Poison check_well_formed if method receivers are invalid to prevent typeck from running on it)
Improve some diagnostics around ?Trait bounds #117411 (Improve some diagnostics around ?Trait bounds)
Don't normalize to an un-revealed opaque when we hit the recursion limit #117414 (Don't normalize to an un-revealed opaque when we hit the recursion limit)

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

…ypeck from running on it

Fix rust-lang#57457.

Detect when trait is implemented for type and suggest importing it Fix rust-lang#57457.

Some diagnostics improvements of `gen` blocks These are leftovers from rust-lang#116447

…ompiler-errors Don't treat closures/coroutine types as part of the public API Fixes a regression from rust-lang#117076 r? `@compiler-errors`

…rrors Correctly handle nested or-patterns in exhaustiveness I had assumed nested or-patterns were flattened, and they mostly are but not always. Fixes rust-lang#117378

…ing_116849, r=compiler-errors Poison check_well_formed if method receivers are invalid to prevent typeck from running on it fixes rust-lang#117379 Though if some code invokes typeck without having first invoked `check_well_formed` then we'll encounter this ICE again. This can happen in const and const fn bodies if they are evaluated due to other `check_well_formed` checks or similar

… r=compiler-errors,Nilstrieb Improve some diagnostics around `?Trait` bounds * uses better spans * clarifies a message that was only talking about generic params, but applies to `dyn ?Trait` and `impl ?Trait` as well

…li-obk Don't normalize to an un-revealed opaque when we hit the recursion limit Currently, we will normalize `Opaque := Option<&Opaque>` to something like `Option<&Option<&Option<&...Opaque>>>`, hitting a limit and bottoming out in an unnormalized opaque after the recursion limit gets hit. Unfortunately, during `layout_of`, we'll simply recurse and try again if the type normalizes to something different than the type: https://github.com/rust-lang/rust/blob/e6e931dda5fffbae0fd87c5b1af753cc95556880/compiler/rustc_ty_utils/src/layout.rs#L58-L60 That means then we'll try to normalize `Option<&Option<&Option<&...Opaque>>>` again, substituting `Opaque` into itself even deeper. Eventually this will get to the point that we're just stack-overflowing on a really deep type before even hitting an opaque again. To fix this, we just bottom out into `ty::Error` instead of the unrevealed opaque type. Fixes rust-lang#117412 r? `@oli-obk`

matthiaskrgr · 2023-10-30T20:03:56Z

@bors r+ rollup=never p=7

bors · 2023-10-30T20:03:58Z

📌 Commit c5aec96 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-10-30T20:50:17Z

⌛ Testing commit c5aec96 with merge 31bc7e2...

bors · 2023-10-30T22:46:41Z

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 31bc7e2 to master...

rust-timer · 2023-10-30T22:48:40Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#116862	Detect when trait is implemented for type and suggest impor…	`d19556f97f27b6570e08ed80ca6d9d79dac631e9` (link)
#117389	Some diagnostics improvements of `gen` blocks	`9c790a1b83dc06e6580734014f0d972067fc35be` (link)
#117396	Don't treat closures/coroutine types as part of the public …	`c89c174073e082abc8f9964b862066107a32ae5e` (link)
#117398	Correctly handle nested or-patterns in exhaustiveness	`093bc99510aeb5b59e92793d202f49608e94ed0c` (link)
#117403	Poison check_well_formed if method receivers are invalid to…	`f0600f1dd3c7e926f8e390d9dad63227acc71e6e` (link)
#117411	Improve some diagnostics around `?Trait` bounds	`26f1522cbddee4db69e99b88754e13dc05e4e9bd` (link)
#117414	Don't normalize to an un-revealed opaque when we hit the re…	`749a76ef85173b2e72dc7c07fd97aefaab6b32cf` (link)

previous master: 236ac911de

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 · 2023-10-31T03:30:18Z

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

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

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)	5.7%	[5.7%, 5.7%]	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: 635.333s -> 636.607s (0.20%)
Artifact size: 304.43 MiB -> 304.46 MiB (0.01%)

oli-obk and others added 19 commits October 30, 2023 10:13

Talk about gen fn in diagnostics about gen fn

745c600

Add a custom panic message for resuming gen blocks after they panicked

bc926f7

Add regression test

972ee01

Don't treat closures/coroutines as part of the public API

8d03e13

Merge two equal match arms

251021c

Some manual rustfmt as rustfmt is broken on this file

43ff2a7

Correctly handle nested or-patterns in column-wise analyses

d5e836c

Poison check_well_formed if method receivers are invalid to prevent t…

ff3a818

…ypeck from running on it

Only run panic tests on targets that can unwind

224ddf8

Detect when trait is implemented for type and suggest importing it

162443b

Fix rust-lang#57457.

Improve some diagnostics around ?Trait bounds

455cf5a

Don't super-fold types when we hit the recursion limit

c91f60e

Rollup merge of rust-lang#116862 - estebank:issue-57457, r=oli-obk

c299595

Detect when trait is implemented for type and suggest importing it Fix rust-lang#57457.

Rollup merge of rust-lang#117389 - oli-obk:gen_fn, r=compiler-errors

86259e7

Some diagnostics improvements of `gen` blocks These are leftovers from rust-lang#116447

Rollup merge of rust-lang#117396 - oli-obk:privacy_visitor_types, r=c…

e648f47

…ompiler-errors Don't treat closures/coroutine types as part of the public API Fixes a regression from rust-lang#117076 r? `@compiler-errors`

Rollup merge of rust-lang#117398 - Nadrieril:fix-117378, r=compiler-e…

342483c

…rrors Correctly handle nested or-patterns in exhaustiveness I had assumed nested or-patterns were flattened, and they mostly are but not always. Fixes rust-lang#117378

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Oct 30, 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 Oct 30, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 30, 2023

bors merged commit 31bc7e2 into rust-lang:master Oct 30, 2023
12 checks passed

rustbot added this to the 1.75.0 milestone Oct 30, 2023

github-actions bot mentioned this pull request Oct 31, 2023

Automated pull from upstream master ferrocene/ferrocene#74

Merged

matthiaskrgr deleted the rollup-jr2p1t2 branch March 16, 2024 18:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 7 pull requests #117415

Rollup of 7 pull requests #117415

matthiaskrgr commented Oct 30, 2023

matthiaskrgr commented Oct 30, 2023

bors commented Oct 30, 2023

bors commented Oct 30, 2023

bors commented Oct 30, 2023

rust-timer commented Oct 30, 2023

rust-timer commented Oct 31, 2023

Rollup of 7 pull requests #117415

Rollup of 7 pull requests #117415

Conversation

matthiaskrgr commented Oct 30, 2023

matthiaskrgr commented Oct 30, 2023

bors commented Oct 30, 2023

bors commented Oct 30, 2023

bors commented Oct 30, 2023

rust-timer commented Oct 30, 2023

rust-timer commented Oct 31, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size