Partially revert #101433

[jackh726]

reverts #101433 to fix #101844

We should get this into the beta cut, since the ICE is getting hit quite a bit.

[rustbot]

rustc_error_messages was changed

cc @davidtwco, @compiler-errors, @JohnTitor, @estebank, @TaKO8Ki

[rust-highfive]

r? @estebank

(rust-highfive has picked a reviewer for you, use r? to override)

[jackh726]

@bors p=10 rollup=never

We really don't want this ICE making it into beta.

[jackh726]

@bors r=nikomatsakis

[bors]

📌 Commit d97fdf1 has been approved by nikomatsakis

It is now in the queue for this repository.

[bors]

⌛ Testing commit d97fdf1 with merge 4d4e51e...

[bors]

☀️ Test successful - checks-actions
Approved by: nikomatsakis
Pushing 4d4e51e to master...

[rust-timer]

Finished benchmarking commit (4d4e51e): 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.

	mean1	range	count2
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.5%	[-0.7%, -0.4%]	6
Improvements ✅ (secondary)	-0.6%	[-0.6%, -0.6%]	1
All ❌✅ (primary)	-0.5%	[-0.7%, -0.4%]	6

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.

	mean1	range	count2
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	2.1%	[2.1%, 2.1%]	1
Improvements ✅ (primary)	-1.3%	[-3.6%, -0.7%]	10
Improvements ✅ (secondary)	-4.0%	[-5.3%, -2.0%]	3
All ❌✅ (primary)	-1.3%	[-3.6%, -0.7%]	10

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.

	mean1	range	count2
Regressions ❌ (primary)	2.3%	[2.3%, 2.3%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-1.9%	[-1.9%, -1.9%]	1
Improvements ✅ (secondary)	-2.1%	[-2.1%, -2.1%]	1
All ❌✅ (primary)	0.2%	[-1.9%, 2.3%]	2

Footnotes

1. the arithmetic mean of the percent change ↩ ↩² ↩³

2. number of relevant changes ↩ ↩² ↩³