Merge `PatKind::Path` into `PatKind::Lit` #134248

oli-obk · 2024-12-13T07:52:26Z

Follow-up to #134228

We always had a duplication where Paths could be represented as PatKind::Path or PatKind::Lit(ExprKind::Path). We had to handle both everywhere, and still do after #134228, so I'm removing it now. subsequently we can also nuke visit_pattern_type_pattern

rustbot · 2024-12-13T07:52:37Z

r? @BoxyUwU

rustbot has assigned @BoxyUwU.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

…ler-errors Forbid overwriting types in typeck While trying to figure out some type setting logic in rust-lang#134248 I realized that we sometimes set a type twice. While hopefully that would have been the same type, we didn't ensure that at all and just silently accepted it. So now we reject setting it twice, unless errors are happening, then we don't care. Best reviewed commit by commit. No behaviour change is intended.

Rollup merge of rust-lang#134474 - oli-obk:push-yomnkntvzlxw, r=compiler-errors Forbid overwriting types in typeck While trying to figure out some type setting logic in rust-lang#134248 I realized that we sometimes set a type twice. While hopefully that would have been the same type, we didn't ensure that at all and just silently accepted it. So now we reject setting it twice, unless errors are happening, then we don't care. Best reviewed commit by commit. No behaviour change is intended.

Forbid overwriting types in typeck While trying to figure out some type setting logic in rust-lang/rust#134248 I realized that we sometimes set a type twice. While hopefully that would have been the same type, we didn't ensure that at all and just silently accepted it. So now we reject setting it twice, unless errors are happening, then we don't care. Best reviewed commit by commit. No behaviour change is intended.

bors · 2024-12-26T21:52:41Z

☔ The latest upstream changes (presumably #134788) made this pull request unmergeable. Please resolve the merge conflicts.

oli-obk · 2025-01-07T10:28:56Z

@bors try @rust-timer queue

Merge `PatKind::Path` into `PatKind::Lit` Follow-up to rust-lang#134228 We always had a duplication where `Path`s could be represented as `PatKind::Path` or `PatKind::Lit(ExprKind::Path)`. We had to handle both everywhere, and still do after rust-lang#134228, so I'm removing it now. subsequently we can also nuke `visit_pattern_type_pattern`

bors · 2025-01-07T10:30:09Z

⌛ Trying commit 2269e1f with merge 801e8e4...

oli-obk · 2025-01-08T14:51:41Z

@bors try @rust-timer queue

Merge `PatKind::Path` into `PatKind::Lit` Follow-up to rust-lang#134228 We always had a duplication where `Path`s could be represented as `PatKind::Path` or `PatKind::Lit(ExprKind::Path)`. We had to handle both everywhere, and still do after rust-lang#134228, so I'm removing it now. subsequently we can also nuke `visit_pattern_type_pattern`

bors · 2025-01-08T14:52:54Z

⌛ Trying commit e40db8a with merge 502c4cd...

oli-obk · 2025-01-09T09:18:40Z

@rust-timer build 502c4cd

rust-timer · 2025-01-09T11:38:30Z

Finished benchmarking commit (502c4cd): comparison URL.

Overall result: ❌✅ regressions and improvements - please read the text below

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf.

Next Steps: If you can justify the regressions found in this try perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please fix the regressions and do another perf run. If the next run shows neutral or positive results, the label will be automatically removed.

@bors rollup=never
@rustbot label: -S-waiting-on-perf +perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

	mean	range	count
Regressions ❌ (primary)	1.0%	[0.2%, 4.8%]	17
Regressions ❌ (secondary)	0.4%	[0.1%, 0.7%]	9
Improvements ✅ (primary)	-0.3%	[-0.3%, -0.3%]	4
Improvements ✅ (secondary)	-1.2%	[-2.0%, -0.4%]	2
All ❌✅ (primary)	0.7%	[-0.3%, 4.8%]	21

Max RSS (memory usage)

Results (primary -2.2%, secondary -0.3%)

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.7%	[2.7%, 2.7%]	1
Improvements ✅ (primary)	-2.2%	[-3.4%, -1.0%]	2
Improvements ✅ (secondary)	-3.2%	[-3.2%, -3.2%]	1
All ❌✅ (primary)	-2.2%	[-3.4%, -1.0%]	2

Cycles

Results (primary 3.2%, secondary -3.5%)

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)	3.2%	[2.0%, 4.9%]	4
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.5%	[-5.1%, -2.0%]	17
All ❌✅ (primary)	3.2%	[2.0%, 4.9%]	4

Binary size

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

Bootstrap: 764.901s -> 766.404s (0.20%)
Artifact size: 325.67 MiB -> 325.77 MiB (0.03%)

oli-obk · 2025-01-09T13:40:04Z

Oof more queries are dirty now because of path literals

oli-obk · 2025-01-10T09:07:56Z

@bors try @rust-timer queue

Merge `PatKind::Path` into `PatKind::Lit` Follow-up to rust-lang#134228 We always had a duplication where `Path`s could be represented as `PatKind::Path` or `PatKind::Lit(ExprKind::Path)`. We had to handle both everywhere, and still do after rust-lang#134228, so I'm removing it now. subsequently we can also nuke `visit_pattern_type_pattern`

bors · 2025-01-10T09:09:08Z

⌛ Trying commit 58d2368 with merge 52f263d...

bors · 2025-01-10T10:56:20Z

☀️ Try build successful - checks-actions
Build commit: 52f263d (52f263d06df1abb4f5cbc6f8a0ffc14e5d532fe5)

rust-timer · 2025-01-10T12:13:29Z

Finished benchmarking commit (52f263d): comparison URL.

Overall result: ❌ regressions - please read the text below

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf.

Next Steps: If you can justify the regressions found in this try perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please fix the regressions and do another perf run. If the next run shows neutral or positive results, the label will be automatically removed.

@bors rollup=never
@rustbot label: -S-waiting-on-perf +perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

	mean	range	count
Regressions ❌ (primary)	0.6%	[0.2%, 1.9%]	10
Regressions ❌ (secondary)	0.4%	[0.1%, 0.7%]	9
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.4%	[-0.4%, -0.4%]	1
All ❌✅ (primary)	0.6%	[0.2%, 1.9%]	10

Max RSS (memory usage)

Results (primary 3.9%, secondary -2.6%)

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)	3.9%	[3.9%, 3.9%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.6%	[-3.2%, -2.0%]	2
All ❌✅ (primary)	3.9%	[3.9%, 3.9%]	1

Cycles

Results (primary 2.0%, secondary -2.8%)

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)	2.0%	[2.0%, 2.1%]	2
Regressions ❌ (secondary)	3.6%	[3.1%, 4.0%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-4.9%	[-6.3%, -4.1%]	6
All ❌✅ (primary)	2.0%	[2.0%, 2.1%]	2

Binary size

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

Bootstrap: 763.376s -> 762.618s (-0.10%)
Artifact size: 325.75 MiB -> 325.75 MiB (0.00%)

rustbot assigned BoxyUwU Dec 13, 2024

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Dec 13, 2024

oli-obk mentioned this pull request Dec 13, 2024

Exhaustively handle expressions in patterns #134228

Merged