Rollup of 7 pull requests #117172

matthiaskrgr · 2023-10-25T15:40:32Z

Successful merges:

Add test for 113326 #116801 (Add test for 113326)
Merge impl_wf_inference (check_mod_impl_wf) check into coherence checking #117133 (Merge impl_wf_inference (check_mod_impl_wf) check into coherence checking)
Intern LocalDefId list from opaque_types_defined_by query #117136 (Intern LocalDefId list from opaque_types_defined_by query)
Update cargo #117150 (Update cargo)
Update THIR unused_unsafe lint #117158 (Update THIR unused_unsafe lint)
Fix typo in test comment #117160 (Fix typo in test comment)
Fix some coroutine sentences that don't make sense anymore. #117168 (Fix some coroutine sentences that don't make sense anymore.)

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Updates THIR behavior to match the changes from rust-lang#93678

Signed-off-by: cui fliter <[email protected]>

These happened during the `generator` -> `coroutine` rename.

…piler-errors Add test for 113326 Closes rust-lang#113326 Bisecting points to rust-lang#113636 as the fix

…ned, r=oli-obk Merge `impl_wf_inference` (`check_mod_impl_wf`) check into coherence checking Problem here is that we call `collect_impl_trait_in_trait_types` when checking `check_mod_impl_wf` which is performed before coherence. Due to the `tcx.sess.track_errors`, since we end up reporting an error, we never actually proceed to coherence checking, where we would be emitting a more useful impl overlap error. This change means that we may report more errors in some cases, but can at least proceed far enough to leave a useful message for overlapping traits with RPITITs in them. Fixes rust-lang#116982 r? types

Intern `LocalDefId` list from `opaque_types_defined_by` query r? oli-obk

Update cargo 2 commits in d2f6a048529eb8e9ebc55d793abd63456c98fac2..df3509237935f9418351b77803df7bc05c009b3d 2023-10-20 18:25:30 +0000 to 2023-10-24 23:09:01 +0000 - Fix unused_imports warning (rust-lang/cargo#12876) - Warn about crate name's format when creating new crate (rust-lang/cargo#12766) r? ghost

…r=oli-obk Update THIR unused_unsafe lint Updates THIR unsafeck behaviour to match the changes from rust-lang#93678

Fix typo in test comment

…Titor Fix some coroutine sentences that don't make sense anymore. These happened during the `generator` -> `coroutine` rename. Found thanks to `@pthariensflame` for their thorough review of the `generator` -> `coroutine` rename rust-lang#116958 (comment)

matthiaskrgr · 2023-10-25T15:40:56Z

@bors r+ rollup=never p=7

bors · 2023-10-25T15:40:58Z

📌 Commit a7d05a6 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-10-25T17:35:05Z

⌛ Testing commit a7d05a6 with merge cf226e9...

bors · 2023-10-25T19:28:48Z

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

rust-timer · 2023-10-25T19:30:46Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#116801	Add test for 113326	`a290e4504f533e8c18aea393bceb37c846bcdb49` (link)
#117133	Merge `impl_wf_inference` (`check_mod_impl_wf`) check into …	`35a20ceaa1a0f1b4b012abda1fca9727baa3c909` (link)
#117136	Intern `LocalDefId` list from `opaque_types_defined_by` que…	`39135d5363af4948d32d8c658444da41bdd5b96a` (link)
#117150	Update cargo	`5f0988e329ebfc6ae44460aea07644b7ce15fd9e` (link)
#117158	Update THIR unused_unsafe lint	`5f17806ba68479d66d0e979efe7eb8c0a78f3106` (link)
#117160	Fix typo in test comment	`06a4e4d61587901372a5de168906a876b0de5132` (link)
#117168	Fix some coroutine sentences that don't make sense anymore.	`9f9c4035fd5d65f62830dbb9f91721cc01ac4b24` (link)

previous master: 964ff0125b

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-25T20:38:30Z

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

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

Binary size

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

Bootstrap: missing data
Artifact size: 304.42 MiB -> 304.44 MiB (0.01%)

clubby789 and others added 14 commits October 16, 2023 18:23

Add test for 113326

43a08bd

Merge impl_wf_inference into coherence checking

a947654

Intern LocalDefId list from opaque query

18b7d9e

Update cargo

fd7bbc2

Make THIR unused_unsafe lint consistent with MIR

dc3d428

Updates THIR behavior to match the changes from rust-lang#93678

Fix problematic comment

11debd7

Signed-off-by: cui fliter <[email protected]>

Fix some coroutine sentences that don't make sense anymore.

1be0033

These happened during the `generator` -> `coroutine` rename.

Rollup merge of rust-lang#116801 - clubby789:issue-113326-test, r=com…

75efc4f

…piler-errors Add test for 113326 Closes rust-lang#113326 Bisecting points to rust-lang#113636 as the fix

Rollup merge of rust-lang#117136 - compiler-errors:defid-list, r=oli-obk

acc68e9

Intern `LocalDefId` list from `opaque_types_defined_by` query r? oli-obk

Rollup merge of rust-lang#117158 - matthewjasper:thir-unused-unsafe, …

105efbb

…r=oli-obk Update THIR unused_unsafe lint Updates THIR unsafeck behaviour to match the changes from rust-lang#93678

Rollup merge of rust-lang#117160 - cuishuang:master, r=lqd

dffed66

Fix typo in test comment

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 25, 2023

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

bors merged commit cf226e9 into rust-lang:master Oct 25, 2023
12 checks passed

rustbot added this to the 1.75.0 milestone Oct 25, 2023

This was referenced Oct 25, 2023

Support enum variants in offset_of! #114208

Merged

Tait must be constrained if in sig #113169

Merged

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

Automated pull from upstream master ferrocene/ferrocene#74

Merged

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 7 pull requests #117172

Rollup of 7 pull requests #117172

matthiaskrgr commented Oct 25, 2023

matthiaskrgr commented Oct 25, 2023

bors commented Oct 25, 2023

bors commented Oct 25, 2023

bors commented Oct 25, 2023

rust-timer commented Oct 25, 2023

rust-timer commented Oct 25, 2023

Rollup of 7 pull requests #117172

Rollup of 7 pull requests #117172

Conversation

matthiaskrgr commented Oct 25, 2023

matthiaskrgr commented Oct 25, 2023

bors commented Oct 25, 2023

bors commented Oct 25, 2023

bors commented Oct 25, 2023

rust-timer commented Oct 25, 2023

rust-timer commented Oct 25, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size