Skip to content

Commit eb92280

Browse files
authored
Rollup merge of rust-lang#50849 - est31:visit_closure_args, r=michaelwoerister
CheckLoopVisitor: also visit closure arguments This turns the ICE rust-lang#50581 in this code: ```rust fn main() { |_: [u8; break]| (); } ``` from ``` 'assertion failed: self.tcx.sess.err_count() > 0', librustc_typeck/check/mod.rs ``` to ``` librustc_mir/hair/cx/expr.rs:543: invalid loop id for break: not inside loop scope ``` which is an ICE as well but at a later stage during compilation and most importantly fixes of bug rust-lang#50576 will fix this as well. As this "only" moves an ICE to a later stage, I didn't add any tests. Now I have manually verified the default impls of the visitor trait to check whether we have missed any other opportunity to visit more stuff and coudln't find anything (except the missing `break` visit I've fixed in rust-lang#50829 but that one was already r+'d so I didn't want to push more commits).
2 parents 20298a9 + 7ad9ef3 commit eb92280

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/librustc_passes/loops.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@ impl<'a, 'hir> Visitor<'hir> for CheckLoopVisitor<'a, 'hir> {
8282
hir::ExprLoop(ref b, _, source) => {
8383
self.with_context(Loop(LoopKind::Loop(source)), |v| v.visit_block(&b));
8484
}
85-
hir::ExprClosure(.., b, _, _) => {
85+
hir::ExprClosure(_, ref function_decl, b, _, _) => {
86+
self.visit_fn_decl(&function_decl);
8687
self.with_context(Closure, |v| v.visit_nested_body(b));
8788
}
8889
hir::ExprBlock(ref b, Some(_label)) => {

0 commit comments

Comments
 (0)