Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

match lowering: Rename MatchPair to MatchPairTree #127858

Merged
merged 2 commits into from
Jul 19, 2024

Conversation

Zalathar
Copy link
Contributor

In #120904, MatchPair became able to store other match pairs as children, forming a tree. That has made the old name confusing, so this patch renames the type to MatchPairTree.

This PR also includes a patch renaming the test method to pick_test_for_match_pair, since it would conflict with the main change.

r? @Nadrieril

In rust-lang#120904, `MatchPair` became able to store other match pairs as children,
forming a tree. That has made the old name confusing, so this patch renames the
type to `MatchPairTree`.
@rustbot 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. labels Jul 17, 2024
@rustbot
Copy link
Collaborator

rustbot commented Jul 17, 2024

Some changes occurred in match lowering

cc @Nadrieril

@Nadrieril
Copy link
Member

👍 I agree that's better, thanks!

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jul 18, 2024

📌 Commit 411fcb6 has been approved by Nadrieril

It is now in the queue for this repository.

@bors 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 Jul 18, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 19, 2024
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#127418 (Wrap too long type name)
 - rust-lang#127594 (Fuchsia status code match arm)
 - rust-lang#127835 (Fix ICE in suggestion caused by `⩵` being recovered as `==`)
 - rust-lang#127858 (match lowering: Rename `MatchPair` to `MatchPairTree`)
 - rust-lang#127871 (Mention that type parameters are used recursively on bivariance error)
 - rust-lang#127913 (remove `debug-logging` default from tools profile)
 - rust-lang#127925 (Remove tag field from `Relation`s)
 - rust-lang#127929 (Use more accurate span for `addr_of!` suggestion)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 19, 2024
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#127418 (Wrap too long type name)
 - rust-lang#127594 (Fuchsia status code match arm)
 - rust-lang#127835 (Fix ICE in suggestion caused by `⩵` being recovered as `==`)
 - rust-lang#127858 (match lowering: Rename `MatchPair` to `MatchPairTree`)
 - rust-lang#127871 (Mention that type parameters are used recursively on bivariance error)
 - rust-lang#127913 (remove `debug-logging` default from tools profile)
 - rust-lang#127925 (Remove tag field from `Relation`s)
 - rust-lang#127929 (Use more accurate span for `addr_of!` suggestion)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 19, 2024
Rollup of 8 pull requests

Successful merges:

 - rust-lang#127418 (Wrap too long type name)
 - rust-lang#127594 (Fuchsia status code match arm)
 - rust-lang#127835 (Fix ICE in suggestion caused by `⩵` being recovered as `==`)
 - rust-lang#127858 (match lowering: Rename `MatchPair` to `MatchPairTree`)
 - rust-lang#127871 (Mention that type parameters are used recursively on bivariance error)
 - rust-lang#127913 (remove `debug-logging` default from tools profile)
 - rust-lang#127925 (Remove tag field from `Relation`s)
 - rust-lang#127929 (Use more accurate span for `addr_of!` suggestion)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 4d5ba0d into rust-lang:master Jul 19, 2024
6 checks passed
@rustbot rustbot added this to the 1.81.0 milestone Jul 19, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jul 19, 2024
Rollup merge of rust-lang#127858 - Zalathar:pair-tree, r=Nadrieril

match lowering: Rename `MatchPair` to `MatchPairTree`

In rust-lang#120904, `MatchPair` became able to store other match pairs as children, forming a tree. That has made the old name confusing, so this patch renames the type to `MatchPairTree`.

This PR also includes a patch renaming the `test` method to `pick_test_for_match_pair`, since it would conflict with the main change.

r? `@Nadrieril`
@Zalathar Zalathar deleted the pair-tree branch July 19, 2024 04:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants