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.

Sign up for GitHub

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

Jump to bottom

Match ergonomics 2024: migration lint #124639

Merged
merged 1 commit into from May 12, 2024
Merged

Match ergonomics 2024: migration lint #124639

merged 1 commit into from May 12, 2024

Conversation

Jules-Bertholet
Copy link
Contributor

Depends on #124567

r? @Nadrieril

cc #123076

@rustbot label A-edition-2024 A-patterns

@rustbot
Copy link
Collaborator

rustbot commented May 3, 2024

Some changes occurred in match checking

cc @Nadrieril

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

@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. A-edition-2024 Area: The 2024 edition A-patterns Relating to patterns and pattern matching labels May 3, 2024
@Jules-Bertholet Jules-Bertholet mentioned this pull request May 3, 2024
Open
16 tasks
Nadrieril
Nadrieril requested changes May 11, 2024
View reviewed changes
Copy link
Member

@Nadrieril Nadrieril left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll wait for you to rebase before looking at rustc_hir_typeck/src/pat.rs. The rest looks good, this is quite clever.

compiler/rustc_mir_build/src/thir/pattern/mod.rs Outdated Show resolved Hide resolved
compiler/rustc_mir_build/messages.ftl Outdated Show resolved Hide resolved
compiler/rustc_mir_build/src/thir/pattern/mod.rs Outdated Show resolved Hide resolved
compiler/rustc_mir_build/src/thir/pattern/mod.rs Outdated Show resolved Hide resolved
compiler/rustc_mir_build/src/thir/pattern/mod.rs Outdated Show resolved Hide resolved
tests/ui/pattern/match_ergonomics_2024.rs Show resolved Hide resolved
@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 11, 2024
@Jules-Bertholet Jules-Bertholet force-pushed the match-ergonomics-2024-migration-lint branch from a12d17d to 936f61e Compare May 11, 2024 16:30
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Nadrieril
Copy link
Member

I took the liberty of pushing to your branch a test that fails the assert! I was pointing out.

@Nadrieril
Copy link
Member

Code looks good, my only comment left is the assert!. Could I also ask you to squash those commits?

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rustbot 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 May 12, 2024
@Jules-Bertholet @Nadrieril
Match ergonomics 2024: migration lint
9d92a7f 
Unfortunately, we can't always offer a machine-applicable suggestion when there are subpatterns from macro expansion.

Co-Authored-By: Guillaume Boisseau <[email protected]>
@Jules-Bertholet Jules-Bertholet force-pushed the match-ergonomics-2024-migration-lint branch from e69752d to 9d92a7f Compare May 12, 2024 15:14
@Nadrieril
Copy link
Member

Ty!

@bors r+

@bors
Copy link
Contributor

bors commented May 12, 2024

📌 Commit 9d92a7f has been approved by Nadrieril

It is now in the queue for this repository.

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 12, 2024
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 12, 2024
@bors
Copy link
Contributor

bors commented May 12, 2024

⌛ Testing commit 9d92a7f with merge ef00278...

@bors
Copy link
Contributor

bors commented May 12, 2024

☀️ Test successful - checks-actions
Approved by: Nadrieril
Pushing ef00278 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 12, 2024
@bors bors merged commit ef00278 into rust-lang:master May 12, 2024
7 checks passed
@Jules-Bertholet Jules-Bertholet deleted the match-ergonomics-2024-migration-lint branch May 12, 2024 22:05
@rustbot rustbot added this to the 1.80.0 milestone May 12, 2024
@bors bors mentioned this pull request May 12, 2024
Open
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (ef00278): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

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

Binary size

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

Bootstrap: 676.465s -> 677.096s (0.09%)
Artifact size: 316.13 MiB -> 316.08 MiB (-0.02%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Nadrieril Nadrieril Awaiting requested review from Nadrieril

Assignees

@Nadrieril Nadrieril

Labels
A-edition-2024 Area: The 2024 edition A-patterns Relating to patterns and pattern matching merged-by-bors This PR was explicitly merged by bors. 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
Milestone
1.80.0
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@Jules-Bertholet @rustbot @rust-log-analyzer @Nadrieril @bors @rust-timer