Implement if-let match guards #79051

LeSeulArtichaut · 2020-11-14T19:14:05Z

Implements rust-lang/rfcs#2294 (tracking issue: #51114).

I probably should do a few more things before this can be merged:

Add tests (added basic tests, more advanced tests could be done in the future?)
Add lint for exhaustive if-let guard (comparable to normal if-let statements)
Fix clippy

However since this is a nightly feature maybe it's fine to land this and do those steps in follow-up PRs.

Thanks a lot @matthewjasper ❤️ for helping me with lowering to MIR! Would you be interested in reviewing this?
r? @ghost for now

compiler/rustc_mir_build/src/build/matches/mod.rs

LeSeulArtichaut · 2020-11-16T21:17:34Z

@matthewjasper This should be ready for review now!

compiler/rustc_mir_build/src/thir/pattern/check_match.rs

LeSeulArtichaut · 2020-11-28T17:19:14Z

Thanks a lot @Nadrieril for the pointers!
@matthewjasper This is ready for review again, sorry for the time I took to rebase this PR.

compiler/rustc_passes/src/check_const.rs

src/tools/clippy/clippy_lints/src/shadow.rs

compiler/rustc_mir_build/src/thir/pattern/check_match.rs

src/tools/clippy/clippy_lints/src/utils/author.rs

LeSeulArtichaut · 2020-11-29T16:43:25Z

All right, CI passes again now 😅

bors · 2020-12-16T22:54:54Z

⌛ Testing commit 0917260 with merge 02d3146f99803253859dae64af1f8c9508ddc37f...

bors · 2020-12-17T00:15:40Z

💔 Test failed - checks-actions

rust-log-analyzer · 2020-12-17T00:15:41Z

Your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @rust-lang/infra. (Feature Requests)

LeSeulArtichaut · 2020-12-17T00:23:35Z

Failure looks spurious?

src/test/ui/rfc-2294-if-let-guard/bindings.rs

src/test/ui/rfc-2294-if-let-guard/feature-gate.stderr

jyn514 · 2020-12-17T01:27:10Z

Looks like aarch64-gnu was cancelled on Github's end? There's no logs.

@bors retry

Rollup of 11 pull requests Successful merges: - rust-lang#79051 (Implement if-let match guards) - rust-lang#79877 (Allow `since="TBD"` for rustc_deprecated) - rust-lang#79882 (Fix issue rust-lang#78496) - rust-lang#80026 (expand-yaml-anchors: Make the output directory separator-insensitive) - rust-lang#80039 (Remove unused `TyEncoder::tcx` required method) - rust-lang#80069 (Test that `core::assert!` is valid) - rust-lang#80072 (Fixed conflict with drop elaboration and coverage) - rust-lang#80073 (Add support for target aliases) - rust-lang#80082 (Revert rust-lang#78790 - rust-src vendoring) - rust-lang#80097 (Add `popcount` and `popcnt` as doc aliases for `count_ones` methods.) - rust-lang#80103 (Remove docs for non-existent parameters in `rustc_expand`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

…, r=davidtwco Change the message for `if_let_guard` feature gate `if-let` guards are now implemented by rust-lang#79051 🎉 Thanks `@camelid` for pointing this out 🙂

…, r=davidtwco Change the message for `if_let_guard` feature gate `if-let` guards are now implemented by rust-lang#79051 🎉 Thanks ``@camelid`` for pointing this out 🙂

…thewjasper Implement if-let match guards Implements rust-lang/rfcs#2294 (tracking issue: rust-lang#51114). I probably should do a few more things before this can be merged: - [x] Add tests (added basic tests, more advanced tests could be done in the future?) - [x] Add lint for exhaustive if-let guard (comparable to normal if-let statements) - [x] Fix clippy However since this is a nightly feature maybe it's fine to land this and do those steps in follow-up PRs. Thanks a lot `@matthewjasper` ❤️ for helping me with lowering to MIR! Would you be interested in reviewing this? r? `@ghost` for now

Mark-Simulacrum · 2020-12-24T14:01:45Z

This was a regression of 3% on the match-stress-enum benchmark, but since it's directly adding more code to it that seems relatively expected. https://perf.rust-lang.org/compare.html?start=a6491be5be9344a325b7e49b0114f3cf67ef199e&end=9b84d36a0b9ea3bf305f36f08d50aa42c26f96c2&stat=instructions:u

Nadrieril · 2020-12-25T02:01:50Z

compiler/rustc_mir_build/src/thir/pattern/check_match.rs

+                let tpat = self.lower_pattern(&mut cx, pat, &mut false).0;
+                check_if_let_guard(&mut cx, &tpat, pat.hir_id);
+            }
+        }


Looks like this loop could be merged with the one above, that would probably reduce the perf impact

I'll try opening a PR. (EDIT: #80367)

Suggested by Nadrieril in rust-lang#79051 (comment).

…adrieril Combine two loops in `check_match` Suggested by Nadrieril in rust-lang#79051 (comment). Opening to get a perf run. Hopefully this code doesn't require everything in the first loop to be done before running the second! (It shouldn't though.) cc `@Nadrieril`

LeSeulArtichaut commented Nov 14, 2020

View reviewed changes

compiler/rustc_mir_build/src/build/matches/mod.rs Outdated Show resolved Hide resolved

LeSeulArtichaut force-pushed the if-let-guard branch 3 times, most recently from 29e5689 to 3a0fc6c Compare November 14, 2020 21:10

matthewjasper self-assigned this Nov 14, 2020

LeSeulArtichaut force-pushed the if-let-guard branch from 87f8143 to a18c1fe Compare November 15, 2020 22:47

This comment has been minimized.

Sign in to view

LeSeulArtichaut force-pushed the if-let-guard branch from a18c1fe to da63c00 Compare November 16, 2020 19:37

This comment has been minimized.

Sign in to view

LeSeulArtichaut force-pushed the if-let-guard branch 2 times, most recently from fb65462 to 3333608 Compare November 16, 2020 20:57

LeSeulArtichaut marked this pull request as ready for review November 16, 2020 21:17

LeSeulArtichaut added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 16, 2020

LeSeulArtichaut changed the title ~~[WIP] Implement if-let match guards~~ Implement if-let match guards Nov 17, 2020

This comment has been minimized.

Sign in to view

Nadrieril reviewed Nov 19, 2020

View reviewed changes

compiler/rustc_mir_build/src/thir/pattern/check_match.rs Outdated Show resolved Hide resolved

LeSeulArtichaut force-pushed the if-let-guard branch 2 times, most recently from e19b725 to 0cb8491 Compare November 28, 2020 16:27

matthewjasper reviewed Nov 29, 2020

View reviewed changes

LeSeulArtichaut force-pushed the if-let-guard branch 5 times, most recently from 967aeab to 95d536e Compare November 29, 2020 16:01

This comment has been minimized.

Sign in to view

LeSeulArtichaut 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 Dec 5, 2020

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 17, 2020

camelid reviewed Dec 17, 2020

View reviewed changes

src/test/ui/rfc-2294-if-let-guard/bindings.rs Show resolved Hide resolved

camelid reviewed Dec 17, 2020

View reviewed changes

src/test/ui/rfc-2294-if-let-guard/feature-gate.stderr Show resolved Hide resolved

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 Dec 17, 2020

JohnTitor mentioned this pull request Dec 17, 2020

Rollup of 11 pull requests #80105

Merged

bors merged commit 1e1ba7c into rust-lang:master Dec 17, 2020

rustbot added this to the 1.50.0 milestone Dec 17, 2020

LeSeulArtichaut deleted the if-let-guard branch December 17, 2020 06:03

LeSeulArtichaut added the F-if_let_guard `#![feature(if_let_guard)]` label Dec 17, 2020

This was referenced Dec 17, 2020

Change the message for if_let_guard feature gate #80121

Merged

Tracking issue for RFC 2294, "if let guard" #51114

Open

Nadrieril reviewed Dec 25, 2020

View reviewed changes

camelid mentioned this pull request Dec 25, 2020

Combine two loops in check_match #80367

Merged

camelid added a commit to camelid/rust that referenced this pull request Jul 23, 2021

Combine two loops in check_match

c3a03ae

Suggested by Nadrieril in rust-lang#79051 (comment).

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implement if-let match guards #79051

Implement if-let match guards #79051

LeSeulArtichaut commented Nov 14, 2020 •

edited

Loading

This comment has been minimized.

This comment has been minimized.

LeSeulArtichaut commented Nov 16, 2020

This comment has been minimized.

LeSeulArtichaut commented Nov 28, 2020

LeSeulArtichaut commented Nov 29, 2020

This comment has been minimized.

bors commented Dec 16, 2020

bors commented Dec 17, 2020

rust-log-analyzer commented Dec 17, 2020

LeSeulArtichaut commented Dec 17, 2020

jyn514 commented Dec 17, 2020

Mark-Simulacrum commented Dec 24, 2020

Nadrieril Dec 25, 2020

camelid Dec 25, 2020 •

edited

Loading

Implement if-let match guards #79051

Implement if-let match guards #79051

Conversation

LeSeulArtichaut commented Nov 14, 2020 • edited Loading

This comment has been minimized.

This comment has been minimized.

LeSeulArtichaut commented Nov 16, 2020

This comment has been minimized.

LeSeulArtichaut commented Nov 28, 2020

LeSeulArtichaut commented Nov 29, 2020

This comment has been minimized.

bors commented Dec 16, 2020

bors commented Dec 17, 2020

rust-log-analyzer commented Dec 17, 2020

LeSeulArtichaut commented Dec 17, 2020

jyn514 commented Dec 17, 2020

Mark-Simulacrum commented Dec 24, 2020

Nadrieril Dec 25, 2020

Choose a reason for hiding this comment

camelid Dec 25, 2020 • edited Loading

Choose a reason for hiding this comment

LeSeulArtichaut commented Nov 14, 2020 •

edited

Loading

camelid Dec 25, 2020 •

edited

Loading