Rollup of 5 pull requests #114492

compiler-errors · 2023-08-05T02:47:41Z

Successful merges:

update overflow handling in the new trait solver #114287 (update overflow handling in the new trait solver)
Migrate GUI colors test to original CSS color format #114475 (Migrate GUI colors test to original CSS color format)
Fix ui-fulldeps missing the internal_features lint on stage 0 #114482 (Fix ui-fulldeps missing the internal_features lint on stage 0)
Fix a typo in the error reporting for sealed traits. #114490 (Fix a typo in the error reporting for sealed traits.)
Rename issue #114423 test files to include context #114491 (Rename issue ICE: None in compiler/rustc_hir_typeck/src/fn_ctxt/suggestions.rs #114423 test files to include context)

r? @ghost
@rustbot modify labels: rollup

we previously had incorrect universes in the query response.

update overflow handling in the new trait solver implements https://hackmd.io/QY0dfEOgSNWwU4oiGnVRLw?view. I want to clean up this doc and add it to the rustc-dev-guide, but I think this PR is ready for merge as is, even without the dev-guide entry. r? `@compiler-errors`

…lor-27, r=notriddle Migrate GUI colors test to original CSS color format Follow-up of rust-lang#111459. r? `@notriddle`

Fix ui-fulldeps missing the `internal_features` lint on stage 0 Similar to rust-lang#114102, `ui-fulldeps --stage=1` builds using the the stage 0 compiler instead of the stage 1 compiler. That means that the new `internal_features` lint is referencing a lint that does not exist. Gate the flag it properly until the next feature bump. Maybe we should just add ui-fulldeps stage 1 into CI somewhere so this is flagged before landing.

…, r=compiler-errors Fix a typo in the error reporting for sealed traits. Fixes a typo in error reporting: "implelement" -> "implement"

…114423-test-names, r=compiler-errors Rename issue rust-lang#114423 test files to include context Addresses feedback given in rust-lang#114461 (comment) r? `@estebank`

compiler-errors · 2023-08-05T02:47:52Z

@bors r+ rollup=never p=5

bors · 2023-08-05T02:47:54Z

📌 Commit 3222084 has been approved by compiler-errors

It is now in the queue for this repository.

bors · 2023-08-05T03:43:12Z

⌛ Testing commit 3222084 with merge fca59ab...

bors · 2023-08-05T05:33:14Z

☀️ Test successful - checks-actions
Approved by: compiler-errors
Pushing fca59ab to master...

rust-timer · 2023-08-05T05:34:40Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#114287	update overflow handling in the new trait solver	`72c7f0ec33b0b7dc5d13a562527c6ae4d578125b` (link)
#114475	Migrate GUI colors test to original CSS color format	`ff0dcdd23dd0dfc515ee23afed4373c31a4d6a79` (link)
#114482	Fix ui-fulldeps missing the `internal_features` lint on sta…	`dd9b711018f4950b6d0905355165574deabbdfb2` (link)
#114490	Fix a typo in the error reporting for sealed traits.	`6b622ec74d5fd5a39bd190792b63e8e33bd264d0` (link)
#114491	Rename issue #114423 test files to include context	`104c3950d5b4834ce46a80b3f9348a392baa01ba` (link)

previous master: 90f0b24ad3

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-08-05T10:14:26Z

Finished benchmarking commit (fca59ab): comparison URL.

Overall result: ❌✅ regressions and improvements - 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.3%	[0.3%, 0.3%]	1
Regressions ❌ (secondary)	0.2%	[0.2%, 0.2%]	1
Improvements ✅ (primary)	-1.0%	[-1.4%, -0.4%]	12
Improvements ✅ (secondary)	-0.7%	[-1.1%, -0.4%]	9
All ❌✅ (primary)	-0.9%	[-1.4%, 0.3%]	13

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

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)	14.8%	[13.3%, 16.1%]	6
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Binary size

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

Bootstrap: 650.303s -> 650.338s (0.01%)

Kobzol · 2023-08-05T10:53:52Z

@rust-timer build 72c7f0ec33b0b7dc5d13a562527c6ae4d578125b

(the only thing that comes to mind)

lqd · 2023-08-05T12:27:18Z

This PR should be self-contained within the new solver, but we'll see.

tt-muncher check looks like a bump back to steady state. And the hyper doc regression looks possibly "expected" with the rustdoc PR in the rollup.

Unless you're trying to find the source of the wins: in that case I'd think it's just the ripples of the incr comp regression noise we've been seeing in the last few merges.

(kinda looks like the top of the batman symbol)

Kobzol · 2023-08-05T12:28:15Z

I was actually worried about this.

lqd · 2023-08-05T12:32:33Z

Since there's no PR involved in CTFE here, I was thinking it was some noise, like this also happened a couple weeks ago in https://perf.rust-lang.org/compare.html?start=1c44af9b791c16557b5bf606707bb76df979134a&end=cec34a43b1b14f4e39363f3b283d7ac4f593ee81&stat=cycles:u

rust-timer · 2023-08-05T14:19:36Z

Finished benchmarking commit (72c7f0ec33b0b7dc5d13a562527c6ae4d578125b): comparison URL.

Overall result: ❌ regressions - 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%]	4
Regressions ❌ (secondary)	0.3%	[0.3%, 0.3%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.3%	[0.3%, 0.3%]	4

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

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

Binary size

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

Bootstrap: 650.303s -> 649.897s (-0.06%)

Kobzol · 2023-08-05T14:34:17Z

@lqd good catch, I didn't know that it blipped recently. Given that the perf. run didn't return anything, and the other PRs should be harmless, I think this can be triaged as resolved.

Kobzol · 2023-08-05T14:35:00Z

@rustbot label: +perf-regression-triaged

lcnr and others added 17 commits August 3, 2023 14:16

avoid more ty::Binder:dummy

a090b45

fix make_ambiguous_response_no_constraints

ae3c353

we previously had incorrect universes in the query response.

add ensure_sufficient_stack to the new solver

c046831

handle overflow in the EvalCtxt separately

a745cbb

rewrite stack dependent overflow handling

8aca388

add tests

b1d9cb9

inline helper methods into with_new_goal

baf0768

Use similar color scheme to make it obvious they are linked

b2a6b99

Migrate GUI colors test to original CSS color format

85ed2fe

Fix ui-fulldeps missing the internal_features lint on stage 0

f78485a

Fix a typo in the error reporting for sealed traits.

d64968b

Rename issue rust-lang#114423 test files to include context

5b8f921

Rollup merge of rust-lang#114475 - GuillaumeGomez:migrate-gui-test-co…

a7f0900

…lor-27, r=notriddle Migrate GUI colors test to original CSS color format Follow-up of rust-lang#111459. r? `@notriddle`

Rollup merge of rust-lang#114490 - kernelmethod:error-reporting-typos…

c023196

…, r=compiler-errors Fix a typo in the error reporting for sealed traits. Fixes a typo in error reporting: "implelement" -> "implement"

Rollup merge of rust-lang#114491 - sebastiantoh:add-context-to-issue-…

3222084

…114423-test-names, r=compiler-errors Rename issue rust-lang#114423 test files to include context Addresses feedback given in rust-lang#114461 (comment) r? `@estebank`

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 Aug 5, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 5, 2023

bors merged commit fca59ab into rust-lang:master Aug 5, 2023
12 checks passed

rustbot added this to the 1.73.0 milestone Aug 5, 2023

This was referenced Aug 5, 2023

Allow filtering what proof trees are dumped to stdout via a rustc attr #113694

Closed

normalize in trait_ref_is_knowable in new solver #114457

Merged

rustbot added the perf-regression Performance regression. label Aug 5, 2023

This comment has been minimized.

Sign in to view

rustbot added the perf-regression-triaged The performance regression has been triaged. label Aug 5, 2023

lqd mentioned this pull request Aug 9, 2023

Add history graph to benchmark detail rust-lang/rustc-perf#1690

Merged

compiler-errors deleted the rollup-lp4sfla branch August 11, 2023 19:45

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 5 pull requests #114492

Rollup of 5 pull requests #114492

compiler-errors commented Aug 5, 2023

compiler-errors commented Aug 5, 2023

bors commented Aug 5, 2023

bors commented Aug 5, 2023

bors commented Aug 5, 2023

rust-timer commented Aug 5, 2023

rust-timer commented Aug 5, 2023

Kobzol commented Aug 5, 2023

This comment has been minimized.

lqd commented Aug 5, 2023

Kobzol commented Aug 5, 2023

lqd commented Aug 5, 2023

rust-timer commented Aug 5, 2023

Kobzol commented Aug 5, 2023

Kobzol commented Aug 5, 2023

Rollup of 5 pull requests #114492

Rollup of 5 pull requests #114492

Conversation

compiler-errors commented Aug 5, 2023

compiler-errors commented Aug 5, 2023

bors commented Aug 5, 2023

bors commented Aug 5, 2023

bors commented Aug 5, 2023

rust-timer commented Aug 5, 2023

rust-timer commented Aug 5, 2023

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Kobzol commented Aug 5, 2023

This comment has been minimized.

lqd commented Aug 5, 2023

Kobzol commented Aug 5, 2023

lqd commented Aug 5, 2023

rust-timer commented Aug 5, 2023

Overall result: ❌ regressions - ACTION NEEDED

Kobzol commented Aug 5, 2023

Kobzol commented Aug 5, 2023