Rollup of 7 pull requests #124295

fmease · 2024-04-23T15:25:18Z

Successful merges:

Wrap dyn type with parentheses in suggestion #120929 (Wrap dyn type with parentheses in suggestion)
Suggest using type args directly instead of equality constraint #122591 (Suggest using type args directly instead of equality constraint)
deref patterns: lower deref patterns to MIR #122598 (deref patterns: lower deref patterns to MIR)
alloc::Layout: explicitly document size invariant on the type level #123048 (alloc::Layout: explicitly document size invariant on the type level)
Do check_coroutine_obligations once per typeck root #123993 (Do check_coroutine_obligations once per typeck root)
Allow nesting subdiagnostics in #[derive(Subdiagnostic)] #124218 (Allow nesting subdiagnostics in #[derive(Subdiagnostic)])
Mark @RUSTC_BUILTIN search path usage as unstable #124285 (Mark @RUSTC_BUILTIN search path usage as unstable)

r? @ghost
@rustbot modify labels: rollup

This handles using deref patterns to choose the correct match arm. This does not handle bindings or guards. Co-authored-by: Deadbeef <ent3rm4n@gmail.com>

This requires nested subdiagnostics.

…tion, r=fmease Wrap dyn type with parentheses in suggestion Close rust-lang#120223 Fix wrong suggestion that is grammatically incorrect. Specifically, I added parentheses to dyn types that need lifetime bound. ``` help: consider adding an explicit lifetime bound | 4 | executor: impl FnOnce(T) -> (dyn Future<Output = ()>) + 'static, | + +++++++++++ ```

…gestion, r=fmease Suggest using type args directly instead of equality constraint When type arguments are written erroneously using an equality constraint we suggest specifying them directly without the equality constraint. Fixes rust-lang#122162 Changes the diagnostic in the issue from: ```rust error[E0229]: associated type bindings are not allowed here 9 | impl std::cmp::PartialEq<Rhs = T> for S { | ^^^^^^^ associated type not allowed here | ``` to ```rust error[E0229]: associated type bindings are not allowed here 9 | impl std::cmp::PartialEq<Rhs = T> for S { | ^^^^^^^ associated type not allowed here | help: to use `T` as a generic argument specify it directly | | impl std::cmp::PartialEq<T> for S { | ~ ```

…wjasper deref patterns: lower deref patterns to MIR This lowers deref patterns to MIR. This is a bit tricky because this is the first kind of pattern that requires storing a value in a temporary. Thanks to rust-lang#123324 false edges are no longer a problem. The thing I'm not confident about is the handling of fake borrows. This PR ignores any fake borrows inside a deref pattern. We are guaranteed to at least fake borrow the place of the first pointer value, which could be enough, but I'm not certain.

alloc::Layout: explicitly document size invariant on the type level rust-lang#95295 added this to the constructor, but it seems worth documenting the type invariant at the type level.

Do `check_coroutine_obligations` once per typeck root We only need to do `check_coroutine_obligations` once per typeck root, especially since the new solver can't really (easily) associate which obligations correspond to which coroutines. This requires us to move the checks for sized coroutine fields into `mir_coroutine_witnesses`, but that's fine imo. r? lcnr

…twco Allow nesting subdiagnostics in #[derive(Subdiagnostic)]

… r=petrochenkov Mark `@RUSTC_BUILTIN` search path usage as unstable Follow up to rust-lang#121843 r? `@petrochenkov`

fmease · 2024-04-23T15:25:31Z

@bors r+ rollup=never p=5

bors · 2024-04-23T15:25:34Z

📌 Commit 5ff1fa9 has been approved by fmease

It is now in the queue for this repository.

bors · 2024-04-23T16:11:13Z

⌛ Testing commit 5ff1fa9 with merge c2f2db7...

bors · 2024-04-23T18:22:39Z

☀️ Test successful - checks-actions
Approved by: fmease
Pushing c2f2db7 to master...

rust-timer · 2024-04-23T18:24:37Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#120929	Wrap dyn type with parentheses in suggestion	`888a0ad85486645fbbc0a9c52ac98cc8383f4257` (link)
#122591	Suggest using type args directly instead of equality constr…	`00ff515058c57d3dc5beae66ebff2ad6bf49e29c` (link)
#122598	deref patterns: lower deref patterns to MIR	`ea0b640a1098f88dc194208099fee68e04388045` (link)
#123048	alloc::Layout: explicitly document size invariant on the ty…	`576bea1971749a13c657db6e6d713ff9f8625dd0` (link)
#123993	Do `check_coroutine_obligations` once per typeck root	`8d0d6bfc0e5f8c8e8b226b781ec2d53528810677` (link)
#124218	Allow nesting subdiagnostics in #[derive(Subdiagnostic)]	`7a18cc32ecc507783356a05155c242423da18f36` (link)
#124285	Mark `@RUSTC_BUILTIN` search path usage as unstable	`c10c5ddca7f3b12c36b9d853cf325d2c3a0813b9` (link)

previous master: cd90d5c035

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 · 2024-04-23T19:40:15Z

Finished benchmarking commit (c2f2db7): 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
Improvements ✅ (secondary)	-0.4%	[-0.4%, -0.4%]	1
All ❌✅ (primary)	-	-	0

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)	1.2%	[1.2%, 1.2%]	1
Regressions ❌ (secondary)	5.9%	[4.9%, 6.8%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	1.2%	[1.2%, 1.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)	2.6%	[2.4%, 2.7%]	4
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Binary size

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

Bootstrap: 674.88s -> 675.427s (0.08%)
Artifact size: 316.16 MiB -> 315.55 MiB (-0.20%)

RalfJung and others added 29 commits March 25, 2024 20:18

alloc::Layout: explicitly document size invariant on the type level

7731135

Rename coroutine_stalled_predicates

aa1653e

Do check_coroutine_obligations once per typeck root

d29178c

redundant ::{self}

0650115

crash -> test

a8c9a0b

Emit suggestions when equality constraints are wrongly used

f7ebad4

Lower deref patterns to MIR

c623319

This handles using deref patterns to choose the correct match arm. This does not handle bindings or guards. Co-authored-by: Deadbeef <ent3rm4n@gmail.com>

Don't fake borrow inside a deref pattern

1dabacd

Track mutability of deref patterns

5c4909b

Allow mutable bindings inside deref patterns

377e095

Address closure-related review

b55afe4

Rework fake borrow calculation

511bd78

Add a non-shallow fake borrow

5053180

Use deep fake borrows for deref patterns

436c612

Test or-patterns inside deref patterns

217a4df

Fix documentation of BorrowKind::Fake

726fb55

Pass translation closure to add_to_diag_with() as reference

5646b65

Allow nesting subdiagnostics

c88bb6c

Fix source ordering of IntoDiagArg impls

b220b74

Move "elided lifetime in path" to subdiagnostic struct

6974e9c

This requires nested subdiagnostics.

Wrap dyn type with parentheses in suggestion

31e581e

Mark @RUSTC_BUILTIN search path usage as unstable

4815155

Rollup merge of rust-lang#123048 - RalfJung:layout, r=dtolnay

2d7d480

alloc::Layout: explicitly document size invariant on the type level rust-lang#95295 added this to the constructor, but it seems worth documenting the type invariant at the type level.

Rollup merge of rust-lang#124218 - Xiretza:subsubdiagnostics, r=david…

6e423e1

…twco Allow nesting subdiagnostics in #[derive(Subdiagnostic)]

Rollup merge of rust-lang#124285 - ferrocene:unstable-L-rust-builtin,…

5ff1fa9

… r=petrochenkov Mark `@RUSTC_BUILTIN` search path usage as unstable Follow up to rust-lang#121843 r? `@petrochenkov`

rustbot added the A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic label Apr 23, 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 Apr 23, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 23, 2024

bors merged commit c2f2db7 into rust-lang:master Apr 23, 2024
13 checks passed

rustbot added this to the 1.79.0 milestone Apr 23, 2024

fmease deleted the rollup-i3apkc6 branch April 23, 2024 18:23

This was referenced Apr 23, 2024

never patterns: lower never patterns to Unreachable in MIR #123332

Merged

Require explicitly marking closures as coroutines #123792

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 7 pull requests #124295

Rollup of 7 pull requests #124295

fmease commented Apr 23, 2024

fmease commented Apr 23, 2024

bors commented Apr 23, 2024

bors commented Apr 23, 2024

bors commented Apr 23, 2024

rust-timer commented Apr 23, 2024

rust-timer commented Apr 23, 2024

Rollup of 7 pull requests #124295

Rollup of 7 pull requests #124295

Conversation

fmease commented Apr 23, 2024

fmease commented Apr 23, 2024

bors commented Apr 23, 2024

bors commented Apr 23, 2024

bors commented Apr 23, 2024

rust-timer commented Apr 23, 2024

rust-timer commented Apr 23, 2024

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size