Rollup of 6 pull requests #111869

Dylan-DPC · 2023-05-23T11:14:29Z

Successful merges:

Fix symbol conflict diagnostic mistakenly being shown instead of missing crate diagnostic #111461 (Fix symbol conflict diagnostic mistakenly being shown instead of missing crate diagnostic)
Also assume wrap-around discriminants in as MIR building #111579 (Also assume wrap-around discriminants in as MIR building)
Remove return type sized check hack from hir typeck #111704 (Remove return type sized check hack from hir typeck)
Check opaques for mismatch during writeback #111853 (Check opaques for mismatch during writeback)
rustdoc: clean up settings.css #111854 (rustdoc: clean up settings.css)
Don't ICE if method receiver fails to unify with arbitrary_self_types #111860 (Don't ICE if method receiver fails to unify with arbitrary_self_types)

r? @ghost
@rustbot modify labels: rollup

Resolves this FIXME: https://github.com/rust-lang/rust/blob/8d18c32b61476ed16dd15074e71be3970368d6d7/compiler/rustc_mir_build/src/build/expr/as_rvalue.rs#L231

This was added to control percentage sizes, in 79956b9 Now, the only percentage size is [`border-radius`], which is based on the size of the box itself, not its containing block. This leaves the property unused. [`border-radius`]: https://developer.mozilla.org/en-US/docs/Web/CSS/border-radius

…ing crate diagnostic

…enkov Fix symbol conflict diagnostic mistakenly being shown instead of missing crate diagnostic This was a refactoring mistake in rust-lang#109213 fixes rust-lang#111284

Also assume wrap-around discriminants in `as` MIR building Resolves this FIXME: https://github.com/rust-lang/rust/blob/8d18c32b61476ed16dd15074e71be3970368d6d7/compiler/rustc_mir_build/src/build/expr/as_rvalue.rs#L231 r? `@oli-obk`

…up, r=oli-obk Remove return type sized check hack from hir typeck Remove a bunch of special-cased suggestions when someone returns `-> dyn Trait` that checks for type equality, etc. This was a pretty complex piece of code that also relied on a hack in hir typeck (see changes to `compiler/rustc_hir_typeck/src/check.rs`), and I'm not convinced that it's necessary to maintain, when all we really need to tell the user is that they should return `-> impl Trait` or `-> Box<dyn Trait>`, depending on their specific use-case. This is necessary because we may need to move the "return type is sized" check from hir typeck to wfcheck, which does not have access to typeck results. This is a prerequisite for that, and I'm fairly confident that the diagnostics "regressions" here are not a big deal.

…i-obk Check opaques for mismatch during writeback Revive rust-lang#111705. I realized that we don't need to put any substs in the writeback results since all of the hidden types have already been remapped. See the comment in `compiler/rustc_middle/src/ty/typeck_results.rs`, which should make that clear for other explorers of the codebase. Additionally, we need to do some diagnostic stashing because the diagnostics we produce during HIR typeck is very poor and we should prefer the diagnostic that comes from MIR, if we have one. r? `@oli-obk`

…leanup, r=GuillaumeGomez rustdoc: clean up `settings.css` An identical CSS rule was merged for settings-check, and an unneeded `position: relative` removed.

…ffleLapkin Don't ICE if method receiver fails to unify with `arbitrary_self_types` Consider: ```rust struct Foo(u32); impl Foo { fn get<R: Deref<Target=Self>>(self: R) -> u32 { self.0 } } fn main() { let mut foo = Foo(1); foo.get::<&Foo>(); } ``` The problem here is that with `arbitrary_self_types`, we're allowed to have a method receiver that mentions generics from the method itself (`fn get<R: Deref<Target=Self>>(self: R)`). Since we don't actually take into account the user-written turbofish generics when doing method lookup (nor do we check that method predicates hold), method probing will happily infer `R = Foo` during the probe. When we later confirm the method, we do use the turbofish'd subst and instead now have that `R = &Foo`. This doesn't unify with the self type we chose during the probe, causing an ICE. Getting this to work correctly will be difficult. Specifically, we'll need to actually pass in the turbofish generics for the method being probed for and check that the self type unifies considering those generics. This seems like a lot of work, and I'm not actually familiar with the restrictions originally called out for `#![feature(arbitrary_self_types)]`, but I think we should probably instead just deny having receivers that mention (type/const) generics that come from the method itself. But I mostly just want to turn this ICE into an error, so I'll leave that up for later PRs. Fixes rust-lang#111838

Dylan-DPC · 2023-05-23T11:14:39Z

@bors r+ rollup=never p=5

bors · 2023-05-23T11:14:41Z

📌 Commit c4f2a62 has been approved by Dylan-DPC

It is now in the queue for this repository.

bors · 2023-05-23T12:47:54Z

⌛ Testing commit c4f2a62 with merge b08148f...

bors · 2023-05-23T15:30:29Z

☀️ Test successful - checks-actions
Approved by: Dylan-DPC
Pushing b08148f to master...

rust-timer · 2023-05-23T15:32:14Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#111860	25d04048a2d64079f9aca60f634114fe69e9f29a
#111854	43f185ee3b069c3ea7c7a92a6b5b4f82122c9af5
#111853	b004b30a3ff053070101f3f9713cebcbcd5a43d7
#111704	d4fa5fa7933e70a22cbdb86abfe5aa124ae92bef
#111579	1b19822a2ff3263e93d8f12e9037f5edfd08f93f
#111461	59504ab3886cac863966d7ae98a57b301919d733

previous master: f3d597b31c

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-05-23T16:45:24Z

Finished benchmarking commit (b08148f): comparison URL.

Overall result: ❌ regressions - ACTION NEEDED

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

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.4%	[0.2%, 0.6%]	12
Regressions ❌ (secondary)	0.2%	[0.2%, 0.2%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.4%	[0.2%, 0.6%]	12

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

Cycles

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

Binary size

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.1%	[0.0%, 0.1%]	8
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.1%	[-0.7%, -0.1%]	12
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.0%	[-0.7%, 0.1%]	20

Bootstrap: 646.644s -> 646.753s (0.02%)

pnkfelix · 2023-05-30T20:05:37Z

@rust-timer build 25d04048a2d64079f9aca60f634114fe69e9f29a

pnkfelix · 2023-05-30T20:06:16Z

@rust-timer build b004b30a3ff053070101f3f9713cebcbcd5a43d7

pnkfelix · 2023-05-30T20:07:37Z

@rust-timer build d4fa5fa7933e70a22cbdb86abfe5aa124ae92bef

pnkfelix · 2023-05-30T20:11:46Z

@rust-timer build 1b19822a2ff3263e93d8f12e9037f5edfd08f93f

rust-timer · 2023-05-30T21:21:33Z

Finished benchmarking commit (25d04048a2d64079f9aca60f634114fe69e9f29a): comparison URL.

Overall result: ❌ regressions - no action needed

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.3%	[0.3%, 0.3%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.3%	[0.3%, 0.3%]	1

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.3%, 1.5%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.7%	[-2.7%, -2.7%]	1
All ❌✅ (primary)	-	-	0

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: 646.644s -> 646.853s (0.03%)

pnkfelix · 2023-05-31T03:25:47Z

@rust-timer build b004b30a3ff053070101f3f9713cebcbcd5a43d7

rust-timer · 2023-05-31T05:35:59Z

Finished benchmarking commit (b004b30a3ff053070101f3f9713cebcbcd5a43d7): comparison URL.

Overall result: ❌ regressions - no action needed

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.4%	[0.4%, 0.4%]	1
Regressions ❌ (secondary)	0.3%	[0.2%, 0.4%]	3
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.4%	[0.4%, 0.4%]	1

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.7%	[1.3%, 2.2%]	2
Improvements ✅ (primary)	-5.1%	[-5.1%, -5.1%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-5.1%	[-5.1%, -5.1%]	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.6%	[1.5%, 1.6%]	2
Regressions ❌ (secondary)	4.1%	[3.3%, 4.9%]	3
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	1.6%	[1.5%, 1.6%]	2

Binary size

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

Bootstrap: 646.644s -> 647.257s (0.09%)

compiler-errors and others added 14 commits May 18, 2023 01:47

Simplify suggestion when returning bare dyn trait

795fdf7

Remove return type sized check hack from hir typeck

3db2bcf

Also assume wrap-around discriminants in as MIR building

400866b

Resolves this FIXME: https://github.com/rust-lang/rust/blob/8d18c32b61476ed16dd15074e71be3970368d6d7/compiler/rustc_mir_build/src/build/expr/as_rvalue.rs#L231

Check opaques for mismatch during writeback

0307db4

rustdoc: merge identical CSS rules

5570fda

Don't ICE if method receiver fails to unify with arbitrary_self_types

05c5caa

Fix symbol conflict diagnostic mistakenly being shown instead of miss…

6d1a1cf

…ing crate diagnostic

Rollup merge of rust-lang#111461 - oli-obk:crate_collision, r=petroch…

731c1a5

…enkov Fix symbol conflict diagnostic mistakenly being shown instead of missing crate diagnostic This was a refactoring mistake in rust-lang#109213 fixes rust-lang#111284

Rollup merge of rust-lang#111854 - notriddle:notriddle/settings-css-c…

32c73c2

…leanup, r=GuillaumeGomez rustdoc: clean up `settings.css` An identical CSS rule was merged for settings-check, and an unneeded `position: relative` removed.

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 May 23, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label May 23, 2023

bors merged commit b08148f into rust-lang:master May 23, 2023

rustbot added this to the 1.71.0 milestone May 23, 2023

bors mentioned this pull request May 23, 2023

Split out opaque collection from from type_of #111862

Merged

rustbot added the perf-regression Performance regression. label May 23, 2023

This comment has been minimized.

Sign in to view

Skepfyr mentioned this pull request Jan 6, 2024

regression: overflow evaluating requirement #113239

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 6 pull requests #111869

Rollup of 6 pull requests #111869

Dylan-DPC commented May 23, 2023

Dylan-DPC commented May 23, 2023

bors commented May 23, 2023

bors commented May 23, 2023

bors commented May 23, 2023

rust-timer commented May 23, 2023

rust-timer commented May 23, 2023

pnkfelix commented May 30, 2023

This comment has been minimized.

pnkfelix commented May 30, 2023

pnkfelix commented May 30, 2023

pnkfelix commented May 30, 2023 •

edited

Loading

rust-timer commented May 30, 2023

pnkfelix commented May 31, 2023

This comment has been minimized.

rust-timer commented May 31, 2023

Rollup of 6 pull requests #111869

Rollup of 6 pull requests #111869

Conversation

Dylan-DPC commented May 23, 2023

Dylan-DPC commented May 23, 2023

bors commented May 23, 2023

bors commented May 23, 2023

bors commented May 23, 2023

rust-timer commented May 23, 2023

rust-timer commented May 23, 2023

Overall result: ❌ regressions - ACTION NEEDED

pnkfelix commented May 30, 2023

This comment has been minimized.

pnkfelix commented May 30, 2023

pnkfelix commented May 30, 2023

pnkfelix commented May 30, 2023 • edited Loading

rust-timer commented May 30, 2023

Overall result: ❌ regressions - no action needed

pnkfelix commented May 31, 2023

This comment has been minimized.

rust-timer commented May 31, 2023

Overall result: ❌ regressions - no action needed

pnkfelix commented May 30, 2023 •

edited

Loading