Merge `PatKind::Path` into `PatKind::Expr` by oli-obk · Pull Request #134248 · rust-lang/rust

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.

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...

bors · 2025-01-23T13:38:56Z

⌛ Trying commit dbf867b with merge a5bd41a...

Merge `PatKind::Path` into `PatKind::Expr` 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.

bors · 2025-01-23T15:49:30Z

☀️ Try build successful - checks-actions
Build commit: a5bd41a (a5bd41a49f2a00ea177a196fca62d6568cc9d37b)

rust-timer · 2025-01-23T17:05:46Z

Finished benchmarking commit (a5bd41a): 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.3%	[0.1%, 0.4%]	8
Regressions ❌ (secondary)	0.3%	[0.1%, 0.5%]	9
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.3%	[0.1%, 0.4%]	8

Max RSS (memory usage)

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

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: 778.767s -> 774.185s (-0.59%)
Artifact size: 325.93 MiB -> 325.92 MiB (-0.00%)

oli-obk · 2025-01-23T17:11:49Z

No diffs in query executions, so it's all about incremental caching being more expensive due to the extra node, which is unavoidable, but also very small. We can always revisit in the future, but more robust code trumps perf for now.

oli-obk · 2025-01-24T16:36:38Z

@rustbot ready

compiler/rustc_passes/src/dead.rs

oli-obk · 2025-01-29T09:17:34Z

@rustbot ready

compiler/rustc_hir_typeck/src/pat.rs

BoxyUwU · 2025-01-29T14:42:17Z

r=me after arg rename

@rustbot author

oli-obk · 2025-01-29T16:08:32Z

@bors r=BoxyUwU

bors · 2025-01-29T16:08:35Z

📌 Commit 559648a has been approved by BoxyUwU

It is now in the queue for this repository.

bors · 2025-01-29T19:16:33Z

⌛ Testing commit 559648a with merge ae5de6c...

bors · 2025-01-29T22:00:46Z

☀️ Test successful - checks-actions
Approved by: BoxyUwU
Pushing ae5de6c to master...

rust-timer · 2025-01-29T23:37:25Z

Finished benchmarking commit (ae5de6c): comparison URL.

Overall result: ❌ regressions - please read the text below

Our benchmarks found a performance regression caused by this PR.
This might be an actual regression, but it can also be just noise.

Next Steps:

If the regression was expected or you think it can be justified,
please write a comment with sufficient written justification, and add
@rustbot label: +perf-regression-triaged to it, to mark the regression as triaged.
If you think that you know of a way to resolve the regression, try to create
a new PR with a fix for the regression.
If you do not understand the regression or you think that it is just noise,
you can ask the @rust-lang/wg-compiler-performance working group for help (members of this group
were already notified of this PR).

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

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

Max RSS (memory usage)

Results (primary 2.3%, secondary -3.9%)

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.8%	[2.1%, 5.4%]	6
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.9%	[-0.9%, -0.9%]	1
Improvements ✅ (secondary)	-3.9%	[-3.9%, -3.9%]	1
All ❌✅ (primary)	2.3%	[-0.9%, 5.4%]	7

Cycles

Results (secondary -2.2%)

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

Binary size

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

Bootstrap: 776.896s -> 777.289s (0.05%)
Artifact size: 328.47 MiB -> 328.44 MiB (-0.01%)

BoxyUwU · 2025-01-30T00:39:11Z

perf regression expected and triaged in #134248 (comment).

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

This comment has been minimized.

Sign in to view

oli-obk force-pushed the patkind-path-removal branch from 7cee193 to eb60270 Compare December 13, 2024 09:20

This comment has been minimized.

Sign in to view

oli-obk force-pushed the patkind-path-removal branch from eb60270 to a29a302 Compare December 13, 2024 10:20

This comment has been minimized.

Sign in to view

oli-obk force-pushed the patkind-path-removal branch 2 times, most recently from 40adfed to 25dae36 Compare December 18, 2024 10:13

oli-obk mentioned this pull request Dec 18, 2024

Forbid overwriting types in typeck #134474

Merged

oli-obk force-pushed the patkind-path-removal branch 2 times, most recently from 2f05ee6 to 1be4ad1 Compare January 7, 2025 10:07

This comment has been minimized.

Sign in to view

oli-obk force-pushed the patkind-path-removal branch from 1be4ad1 to 2269e1f Compare January 7, 2025 10:19

This comment has been minimized.

Sign in to view

rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jan 7, 2025

This comment has been minimized.

Sign in to view

rustbot added perf-regression Performance regression. and removed S-waiting-on-perf Status: Waiting on a perf run to be completed. labels Jan 23, 2025

oli-obk force-pushed the patkind-path-removal branch from dbf867b to 0ff30ff Compare January 24, 2025 16:36

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 24, 2025

oli-obk force-pushed the patkind-path-removal branch from 0ff30ff to ef0947e Compare January 27, 2025 11:41

BoxyUwU reviewed Jan 28, 2025

View reviewed changes

compiler/rustc_passes/src/dead.rs Outdated Show resolved Hide resolved

This comment has been minimized.

Sign in to view

BoxyUwU approved these changes Jan 29, 2025

View reviewed changes

compiler/rustc_hir_typeck/src/pat.rs Outdated Show resolved Hide resolved

oli-obk added 3 commits January 29, 2025 15:45

Eliminate PatKind::Path

f47ad71

Add regression test showing we don't realize some consts are used

8f09abb

Handle all PatExprs in dead code analysis

559648a

This was referenced Jan 29, 2025

Improve dead code analysis for structs and traits defined locally #128637

Closed

[rustdoc] Add support for associated items in "jump to def" feature #135771

Merged

petrochenkov mentioned this pull request Mar 12, 2025

Give integer literals a sign instead of relying on negation expressions #136860

Closed

Uh oh!

Conversation

oli-obk commented Dec 13, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Dec 13, 2024

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

bors commented Dec 26, 2024

Uh oh!

This comment has been minimized.

oli-obk commented Jan 7, 2025

Uh oh!

This comment has been minimized.

bors commented Jan 7, 2025

Uh oh!

This comment has been minimized.

bors commented Jan 23, 2025

Uh oh!

bors commented Jan 23, 2025

Uh oh!

This comment has been minimized.

rust-timer commented Jan 23, 2025

Overall result: ❌ regressions - please read the text below

Uh oh!

oli-obk commented Jan 23, 2025

Uh oh!

oli-obk commented Jan 24, 2025

Uh oh!

Uh oh!

oli-obk commented Jan 29, 2025

Uh oh!

This comment has been minimized.

Uh oh!

BoxyUwU commented Jan 29, 2025

Uh oh!

oli-obk commented Jan 29, 2025

Uh oh!

bors commented Jan 29, 2025

Uh oh!

bors commented Jan 29, 2025

Uh oh!

bors commented Jan 29, 2025

Uh oh!

rust-timer commented Jan 29, 2025

Overall result: ❌ regressions - please read the text below

Uh oh!

BoxyUwU commented Jan 30, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

oli-obk commented Dec 13, 2024 •

edited

Loading