Omitted the walks in visit_expr() and visit_stmt() #51993
Merged
Conversation
This file contains 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
|
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @oli-obk (or someone else) soon. If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes. Please see the contribution instructions for more information. |
rust-highfive
added
the
S-waiting-on-review
|
The job 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 |
|
The job 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 |
|
The job 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 |
|
The job 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 |
|
The job 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 |
|
The job 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 |
|
The job 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 |
|
Hmm... curious, it fails on paths. Try adding |
|
The job 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 |
oli-obk
reviewed
Jul 4, 2018
| hir::ExprArray(_) | | ||
| hir::ExprType(..) | | ||
| hir::ExprTup(..) => {} | ||
| hir::ExprBlock(ref box_block, ref _option_label) => { |
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
oli-obk
reviewed
Jul 4, 2018
|
|
||
| hir::ExprArray(ref hirvec) => { | ||
| for index in hirvec.iter() { | ||
| match *index { |
There was a problem hiding this comment.
you don't need this match, it should be fine to call v.visit_expr(index) directly, if that fails, use v.visit_expr(&**index) to force a deref.
That transformation can be applied to all the match statements you used for reference conversions
oli-obk
reviewed
Jul 4, 2018
| @@ -293,27 +293,38 @@ fn check_expr<'a, 'tcx>(v: &mut CheckCrateVisitor<'a, 'tcx>, e: &hir::Expr, node | |||
| hir::ExprIndex(..) if v.tables.is_method_call(e) => { | |||
| v.promotable = false; | |||
| } | |||
| hir::ExprBox(_) => { | |||
| hir::ExprBox(ref expr) => { | |||
| match *expr { | |||
There was a problem hiding this comment.
this match is also unnecessary
|
The job 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 |
oli-obk
requested changes
Jul 4, 2018
| @@ -293,27 +293,36 @@ fn check_expr<'a, 'tcx>(v: &mut CheckCrateVisitor<'a, 'tcx>, e: &hir::Expr, node | |||
| hir::ExprIndex(..) if v.tables.is_method_call(e) => { | |||
There was a problem hiding this comment.
you need to recurse into the fields of these three matches, too
| v.visit_expr(expr); | ||
| for index in hirvec_arm.iter() { | ||
| match *index { | ||
| ref arm => match arm.guard { |
There was a problem hiding this comment.
you also need to recurse into the other fields of arm
| v.visit_expr(expr); | ||
| match **box_block { | ||
| ref block => { | ||
| match block.expr { |
There was a problem hiding this comment.
you need to visit all block statements, too. it would probably be better to create a visit_block function and call that one with the block as an argument, because then you can reuse it below in ExprLoop and above in ExprBlock
|
|
||
| hir::ExprContinue(_) => {} | ||
|
|
||
| hir::ExprRet(ref option_expr) => { |
There was a problem hiding this comment.
you can merge ExprBreak and ExprRet by making ref _destination be _
| hir::ExprAssign(..) | | ||
| hir::ExprAssignOp(..) | | ||
| hir::ExprInlineAsm(..) => { | ||
| hir::ExprAssign(ref lhs, ref rhs) => { |
There was a problem hiding this comment.
you can merge this with ExprAssignOp by making ref _binop be _
|
The job 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 |
|
The job 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 |
|
The job 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 |
|
The job 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 |
oli-obk
requested changes
Jul 5, 2018
| hir::ExprInlineAsm(..) => { | ||
| hir::ExprAssignOp(_, ref lhs, ref rhs) | hir::ExprAssign(ref lhs, ref rhs) => { | ||
| v.visit_expr(lhs); | ||
| v.visit_expr(rhs); |
There was a problem hiding this comment.
you lost the v.promotable = false; here
|
|
||
| // Generator expressions | ||
| hir::ExprYield(_) | | ||
| hir::ExprYield(ref expr) => { | ||
| v.visit_expr(&expr) |
There was a problem hiding this comment.
v.promotable = false; missing here
| } | ||
| } | ||
|
|
||
| hir::ExprContinue(_) => {} |
There was a problem hiding this comment.
you lost the v.promotable = false; here
| hir::ExprBreak(..) | | ||
| hir::ExprContinue(_) | | ||
| hir::ExprRet(_) | | ||
| hir::ExprBreak(_, ref option_expr) | hir::ExprRet(ref option_expr) => { |
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
| } | ||
|
|
||
| hir::ExprLoop(ref box_block, ref _option_label, ref _loop_source) => { | ||
| v.visit_block(box_block); |
There was a problem hiding this comment.
v.promotable = false; missing here
| hir::ExprWhile(..) | | ||
| hir::ExprLoop(..) | | ||
| hir::ExprWhile(ref expr, ref box_block, ref _option_label) => { | ||
| v.visit_expr(expr); |
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
| match option_expr { | ||
| Some(ref expr) => v.visit_expr(&expr), | ||
| None => {}, | ||
| } |
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
| None => {}, | ||
| } } | ||
| } | ||
| } |
There was a problem hiding this comment.
v.promotable = false; missing here
|
The job 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 |
oli-obk
requested changes
Jul 5, 2018
| match block.expr { | ||
| Some(ref box_expr) => { self.visit_expr(&*box_expr) }, | ||
| None => {}, | ||
| } } |
There was a problem hiding this comment.
can you add a line-break between those two closing bracket?
| @@ -271,6 +269,19 @@ impl<'a, 'tcx> Visitor<'tcx> for CheckCrateVisitor<'a, 'tcx> { | |||
| } | |||
| self.promotable &= outer; | |||
| } | |||
|
|
|||
| fn visit_block(&mut self, box_block: &'tcx hir::Block) { | |||
| match *box_block { | |||
There was a problem hiding this comment.
rename argument to block and remove the match
| v.promotable = false; | ||
| } | ||
| hir::ExprUnary(op, _) => { | ||
| hir::ExprUnary(op, ref expr) => { | ||
| match *expr { |
|
|
||
| v.promotable = false; | ||
| } | ||
| _ => {} | ||
| } | ||
| } | ||
| hir::ExprCast(ref from, _) => { | ||
| match *from { |
| @@ -379,7 +397,13 @@ fn check_expr<'a, 'tcx>(v: &mut CheckCrateVisitor<'a, 'tcx>, e: &hir::Expr, node | |||
| } | |||
| } | |||
| } | |||
| hir::ExprCall(ref callee, _) => { | |||
| hir::ExprCall(ref callee, ref hirvec) => { | |||
| match **callee { | |||
| hir::ExprStruct(..) => { | ||
| hir::ExprStruct(ref _qpath, ref hirvec, ref option_expr) => { | ||
| for index in hirvec.iter() { | ||
| match *index { |
| hir::ExprField(ref expr, _) => { | ||
| hir::ExprField(ref expr, _ident) => { | ||
| match *expr { | ||
| ref expr => { v.visit_expr(&expr) }, |
| hir::ExprMatch(ref expr, ref hirvec_arm, ref _match_source) => { | ||
| v.visit_expr(expr); | ||
| for index in hirvec_arm.iter() { | ||
| match *index { |
| for index in hirvec_arm.iter() { | ||
| match *index { | ||
| ref arm => { | ||
| match arm.body { |
There was a problem hiding this comment.
remove this nop-match, too. just use v.visit_expr(&arm.body)
| ref expr => v.visit_expr(&*expr), | ||
| } | ||
| match arm.guard { | ||
| Some(ref expr) => v.visit_expr(&expr), |
There was a problem hiding this comment.
fix indentation and newlines here
|
The job 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 |
oli-obk
reviewed
Jul 5, 2018
| @@ -523,6 +511,17 @@ fn check_expr<'a, 'tcx>( | |||
|
|
|||
| // Conditional control flow (possible to implement). | |||
| hir::ExprMatch(ref expr, ref hirvec_arm, ref _match_source) => { | |||
| if let hir::ExprMatch(ref discr, ref arms, _) = e.node { | |||
There was a problem hiding this comment.
uh.... please don't match again, just reuse the arguments you already pattern matched (expr and hirvec_arm), or rename these to discr and arms
oli-obk
reviewed
Jul 5, 2018
|
|
||
| v.promotable = false; | ||
| } | ||
| _ => {} | ||
| } | ||
| v.promotable = false; |
There was a problem hiding this comment.
uhm... what is this line doing here?
oli-obk
reviewed
Jul 5, 2018
| if op == hir::UnDeref { | ||
| v.promotable = false; | ||
| } | ||
| v.promotable = false; |
oli-obk
reviewed
Jul 5, 2018
| } | ||
| hir::ExprCast(ref from, _) => { | ||
| match *from { |
oli-obk
reviewed
Jul 5, 2018
| } | ||
| v.visit_expr(lhs); | ||
| v.visit_expr(rhs); | ||
| v.promotable = false; |
There was a problem hiding this comment.
This v.promotable = false is wrong
oli-obk
reviewed
Jul 6, 2018
| if op == hir::UnDeref { | ||
| v.promotable = false; | ||
| } | ||
| } | ||
| hir::ExprBinary(op, ref lhs, _) => { | ||
| hir::ExprBinary(op, ref lhs, ref rhs) => { | ||
| v.visit_expr(lhs); |
oli-obk
reviewed
Jul 6, 2018
| @@ -324,6 +324,7 @@ fn check_expr<'a, 'tcx>(v: &mut CheckCrateVisitor<'a, 'tcx>, e: &hir::Expr, node | |||
| } | |||
| } | |||
| hir::ExprPath(ref qpath) => { | |||
| v.visit_qpath(qpath, e.id, e.span); | |||
oli-obk
reviewed
Jul 6, 2018
| v.visit_expr(expr); | ||
| } | ||
|
|
||
| hir::ExprRepeat(ref expr, ref _anon_cast) => { |
oli-obk
reviewed
Jul 6, 2018
|
|
||
| v.visit_expr(expr); | ||
| for index in hirvec_arm.iter() { | ||
| match *index { |
|
The job 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 |
oli-obk
reviewed
Jul 6, 2018
| NestedVisitorMap::None | ||
| } | ||
|
|
||
| impl<'a, 'tcx>CheckCrateVisitor<'a, 'tcx> { |
There was a problem hiding this comment.
Style nit: add a space before the Check
oli-obk
approved these changes
Jul 7, 2018
|
@bors r+ |
|
📌 Commit f629eb3 has been approved by |
bors
added
S-waiting-on-bors
|
⌛ Testing commit f629eb3 with merge 6b5e396c75db3b28c842d88d39af65afd516fb9b... |
|
💔 Test failed - status-travis |
bors
added
S-waiting-on-review
|
The job 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 |
1 similar comment
|
The job 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 |
|
Looks like a spurious network failure. |
bors
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Jul 7, 2018
Omitted the walks in visit_expr() and visit_stmt() @oli-obk
|
☀️ Test successful - status-appveyor, status-travis |
eddyb
reviewed
Jul 12, 2018
| @@ -169,12 +168,7 @@ impl<'a, 'gcx> CheckCrateVisitor<'a, 'gcx> { | |||
| } | |||
| } | |||
|
|
|||
| impl<'a, 'tcx> Visitor<'tcx> for CheckCrateVisitor<'a, 'tcx> { | |||
There was a problem hiding this comment.
I should note that this part of the change makes no sense without #52318.
Please motivate such changes better in the future, using the PR description.
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.
@oli-obk