Rollup of 11 pull requests by matthiaskrgr · Pull Request #105746 · rust-lang/rust

matthiaskrgr · 2022-12-15T11:46:06Z

Successful merges:

Ensure async trait impls are async (or otherwise return an opaque type) #104592 (Ensure async trait impls are async (or otherwise return an opaque type))
Fix -Z print-type-sizes for generators with discriminant field ordered first #105623 (Fix -Z print-type-sizes for generators with discriminant field ordered first)
Auto traits in dyn Trait + Auto are suggestable #105627 (Auto traits in dyn Trait + Auto are suggestable)
Make report_projection_error more Term agnostic #105633 (Make report_projection_error more Term agnostic)
Various cleanups to dest prop #105683 (Various cleanups to dest prop)
Add regression test for #104678 #105692 (Add regression test for async_fn_in_trait: lifetime of implemented async trait fn wrongly evaluates to static #104678)
rustdoc: remove unnecessary CSS kbd { cursor: default } #105707 (rustdoc: remove unnecessary CSS kbd { cursor: default })
Do not mention long types in E0599 label #105715 (Do not mention long types in E0599 label)
more clippy::complexity fixes #105722 (more clippy::complexity fixes)
rustdoc: remove no-op CSS .scrape-example .src-line-numbers { margin: 0 } #105724 (rustdoc: remove no-op CSS .scrape-example .src-line-numbers { margin: 0 })
rustdoc: remove no-op CSS .item-info:before { color } #105730 (rustdoc: remove no-op CSS .item-info:before { color })

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Signed-off-by: Yuki Okushi <jtitor@2k36.org>

Added along with theme picker changes in e78f139, but no reason seems to have been given at the time for why this particular rule was added. Removing this rule results in `<kbd>` elements getting an I-bar, while the rule causes them to use the "default" arrow, but since selecting the text in these elements works fine, the I-bar is not misleading.

The type is already mentioned in the main message and the list of unmet bounds.

…: 0 }` This is the default CSS for `<pre>` tags in `.code-wrapper` anyway, so this line does nothing.

As a workaround for the full `#[refine]` semantics not being implemented yet, forbit returning a concrete future type like `Box<dyn Future>` or a manually implemented Future. `-> impl Future` is still permitted; while that can also cause accidental refinement, that's behind a different feature gate (`return_position_impl_trait_in_trait`) and that problem exists regardless of whether the trait method is async, so will have to be solved more generally. Fixes rust-lang#102745

No content is set, so this pseudo-element does not exist. The CSS was obsoleted by 73d0f7c.

…ler-errors Ensure async trait impls are async (or otherwise return an opaque type) As a workaround for the full `#[refine]` semantics not being implemented yet, forbit returning a concrete future type like `Box<dyn Future>` or a manually implemented Future. `-> impl Future` is still permitted; while that can also cause accidental refinement, that's behind a different feature gate (`return_position_impl_trait_in_trait`) and that problem exists regardless of whether the trait method is async, so will have to be solved more generally. Fixes rust-lang#102745

…e-fix, r=Nilstrieb Fix `-Z print-type-sizes` for generators with discriminant field ordered first Fixes rust-lang#105589 Fixes rust-lang#105591

…le, r=davidtwco Auto traits in `dyn Trait + Auto` are suggestable Not sure why I had made the `IsSuggestableVisitor` have that rule to not consider `dyn Trait + Auto` to be suggestable. It's possible that this was done because of the fact that we don't print the right parentheses for `&(dyn Trait + Auto)`, but that's a problem with printing these types in general that we probably have tracked somewhere else...

…li-obk Make `report_projection_error` more `Term` agnostic Fixes rust-lang#105632

…iasko Various cleanups to dest prop This makes fixing the issues identified in rust-lang#105577 easier. A couple changes - Use an enum with names instead of a bool - Only call `remove_candidates_if` from one place instead of two. Doing it from two places is far too fragile, since any divergence in the behavior between those callsites is likely to be unsound. - Remove `is_constant`. Right now we only merge locals, so this doesn't do anything, and the logic would be wrong if it did. r? `@tmiasko`

…-errors Add regression test for rust-lang#104678 Closes rust-lang#104678 r? `````@compiler-errors````` Signed-off-by: Yuki Okushi <jtitor@2k36.org>

…jhpratt,GuillaumeGomez rustdoc: remove unnecessary CSS `kbd { cursor: default }` Added along with theme picker changes in https://github.com/rust-lang/rust/pull/47686/files#diff-7dc22a0530802d77c2f2ec9e834024a5657b6eab4055520fca46edc99a544413R1144, but no reason seems to have been given at the time for why this particular rule was added. Removing this rule results in `<kbd>` elements getting an I-bar, while the rule causes them to use the "default" arrow, but since selecting the text in these elements works fine, the I-bar is not misleading.

… r=compiler-errors Do not mention long types in E0599 label The type is already mentioned in the main message and the list of unmet bounds.

…rors more clippy::complexity fixes r? ```@compiler-errors```

…-src-line-numbers, r=GuillaumeGomez rustdoc: remove no-op CSS `.scrape-example .src-line-numbers { margin: 0 }` This is the default CSS for `<pre>` tags in `.code-wrapper` anyway, so this line does nothing.

…re, r=GuillaumeGomez rustdoc: remove no-op CSS `.item-info:before { color }` No content is set, so this pseudo-element does not exist. The CSS was obsoleted by 73d0f7c.

matthiaskrgr · 2022-12-15T11:46:18Z

@bors r+ rollup=never p=11

bors · 2022-12-15T11:46:20Z

📌 Commit 2650b7b has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2022-12-15T14:04:28Z

⌛ Testing commit 2650b7b with merge 984eab5...

bors · 2022-12-15T17:04:18Z

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

rust-timer · 2022-12-15T17:07:26Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#105730	510ac2ff4c7bf42c11bb9770b999d3fefb3dd8be
#105724	4483b659acb6248228aa45ad49e3c46199c347c6
#105722	b09571426517b03026930daf20bfa57058905f89
#105715	1f0dc7977cdc5ca00de3030a4649a94d247b6da9
#105707	8731aa80b33a70f0f6c33d55b348453430bae47d
#105692	c6f9bde1bb568da05847f4a820476706247ca5b6
#105683	43895088587bbf89e2e11bfb082d86af303e0704
#105633	f6c03d2a88c65c14b94e208dff3ab6dbc9875c73
#105627	b5159ffcd84ac6e023f0e9fe463bfa02e22c8c3f
#105623	766f44991dd9d56d01f34ff516f9cb58867600b3
#104592	2bf1e9ac8a24d20bf72f546f100e1212d79c20db

previous master: 397b66e77b

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-12-15T18:22:26Z

Finished benchmarking commit (984eab5): 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)	1.4%	[1.4%, 1.4%]	1
Improvements ✅ (primary)	-3.0%	[-3.0%, -3.0%]	1
Improvements ✅ (secondary)	-1.3%	[-1.3%, -1.3%]	1
All ❌✅ (primary)	-3.0%	[-3.0%, -3.0%]	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)	1.1%	[1.1%, 1.1%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-5.6%	[-5.9%, -5.3%]	6
All ❌✅ (primary)	1.1%	[1.1%, 1.1%]	1

JohnTitor and others added 23 commits December 14, 2022 19:00

Add regression test for rust-lang#104678

687b4d9

Signed-off-by: Yuki Okushi <jtitor@2k36.org>

Consider discriminant fields that are ordered before variant fields

5f5ae17

Make print_type_sizes test not use feature(start)

bdc3c4b

Make report_projection_error more term agnostic

7bf36de

Auto traits in dyn are suggestable

cfa6a93

Do not mention long types in E0599 label

2a0d712

The type is already mentioned in the main message and the list of unmet bounds.

more clippy::complexity fixes

de59844

rustdoc: remove no-op CSS `.scrape-example .src-line-numbers { margin…

afcc354

…: 0 }` This is the default CSS for `<pre>` tags in `.code-wrapper` anyway, so this line does nothing.

rustdoc: remove no-op CSS .item-info:before { color }

6ac0b94

No content is set, so this pseudo-element does not exist. The CSS was obsoleted by 73d0f7c.

Various cleanups to dest prop

a5beb7a

Rollup merge of rust-lang#105623 - compiler-errors:generator-type-siz…

5d24760

…e-fix, r=Nilstrieb Fix `-Z print-type-sizes` for generators with discriminant field ordered first Fixes rust-lang#105589 Fixes rust-lang#105591

Rollup merge of rust-lang#105633 - compiler-errors:term-agnostic, r=o…

78cf8cc

…li-obk Make `report_projection_error` more `Term` agnostic Fixes rust-lang#105632

Rollup merge of rust-lang#105692 - JohnTitor:issue-104678, r=compiler…

8111cc4

…-errors Add regression test for rust-lang#104678 Closes rust-lang#104678 r? `````@compiler-errors````` Signed-off-by: Yuki Okushi <jtitor@2k36.org>

Rollup merge of rust-lang#105715 - estebank:unsatisfied-bounds-label,…

cb9bcaf

… r=compiler-errors Do not mention long types in E0599 label The type is already mentioned in the main message and the list of unmet bounds.

Rollup merge of rust-lang#105722 - matthiaskrgr:compl2, r=compiler-er…

c0862f3

…rors more clippy::complexity fixes r? ```@compiler-errors```

Rollup merge of rust-lang#105724 - notriddle:notriddle/scrape-example…

99a1bfc

…-src-line-numbers, r=GuillaumeGomez rustdoc: remove no-op CSS `.scrape-example .src-line-numbers { margin: 0 }` This is the default CSS for `<pre>` tags in `.code-wrapper` anyway, so this line does nothing.

Rollup merge of rust-lang#105730 - notriddle:notriddle/item-info-befo…

2650b7b

…re, r=GuillaumeGomez rustdoc: remove no-op CSS `.item-info:before { color }` No content is set, so this pseudo-element does not exist. The CSS was obsoleted by 73d0f7c.

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 Dec 15, 2022

bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 15, 2022

bors merged commit 984eab5 into rust-lang:master Dec 15, 2022

rustbot added this to the 1.68.0 milestone Dec 15, 2022

This was referenced Dec 15, 2022

Allow impl Trait inside where clauses #105043

Closed

Migrate Jump to def links background to CSS variable #105739

Merged

Refactoring report_method_error #105752

Merged

matthiaskrgr deleted the rollup-sz3grbv branch December 22, 2022 10:47

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 11 pull requests#105746

Rollup of 11 pull requests#105746
bors merged 23 commits intorust-lang:masterfrom
matthiaskrgr:rollup-sz3grbv

matthiaskrgr commented Dec 15, 2022

Uh oh!

matthiaskrgr commented Dec 15, 2022

Uh oh!

bors commented Dec 15, 2022

Uh oh!

bors commented Dec 15, 2022

Uh oh!

bors commented Dec 15, 2022

Uh oh!

rust-timer commented Dec 15, 2022

Uh oh!

rust-timer commented Dec 15, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

Uh oh!

Conversation

matthiaskrgr commented Dec 15, 2022

Uh oh!

matthiaskrgr commented Dec 15, 2022

Uh oh!

bors commented Dec 15, 2022

Uh oh!

bors commented Dec 15, 2022

Uh oh!

bors commented Dec 15, 2022

Uh oh!

rust-timer commented Dec 15, 2022

Uh oh!

rust-timer commented Dec 15, 2022

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants