head expression => scrutinee #59691
Closed
head expression => scrutinee #59691
+16
−16
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rust-highfive
added
the
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
Centril
force-pushed
the
head-is-scrutinee
branch
from
5cb9ffd to
36c5b9f
Compare
|
cc @rust-lang/lang |
|
ping from triage @matthewjasper waiting for your review on this |
| Match(ref head, _) => (head, "`match` head expression", true), | ||
| IfLet(_, ref cond, ..) => (cond, "`if let` scrutinee", true), | ||
| WhileLet(_, ref cond, ..) => (cond, "`while let` scrutinee", true), | ||
| ForLoop(_, ref cond, ..) => (cond, "`for` scrutinee", true), |
There was a problem hiding this comment.
I'm not sure "scrutinee" is correct here. The obvious "iterator expression" isn't really correct either, since it only has to implement IntoIterator. I guess this is fine for now.
| @@ -1011,22 +1011,22 @@ pub fn walk_expr<'v, V: Visitor<'v>>(visitor: &mut V, expression: &'v Expr) { | |||
| visitor.visit_expr(subexpression); | |||
| visitor.visit_ty(typ) | |||
| } | |||
| ExprKind::If(ref head_expression, ref if_block, ref optional_else) => { | |||
| visitor.visit_expr(head_expression); | |||
| ExprKind::If(ref scrutinee, ref if_block, ref optional_else) => { | |||
There was a problem hiding this comment.
For If and While this should be condition (although I guess this code is going away soon).
|
☔ The latest upstream changes (presumably #60296) made this pull request unmergeable. Please resolve the merge conflicts. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
r? @matthewjasper
See https://doc.rust-lang.org/nightly/reference/glossary.html#scrutinee.
I believe there are uses of "discriminant" elsewhere that should be changed to "scrutinee" but that is not for this PR.