Skip to content

Commit

Permalink
Fix visitation order of calls so that it matches execution order. Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Zoxc committed Feb 9, 2018
1 parent fee39ba commit 774997d
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/librustc/hir/intravisit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -965,8 +965,8 @@ pub fn walk_expr<'v, V: Visitor<'v>>(visitor: &mut V, expression: &'v Expr) {
walk_list!(visitor, visit_expr, subexpressions);
}
ExprCall(ref callee_expression, ref arguments) => {
visitor.visit_expr(callee_expression);
walk_list!(visitor, visit_expr, arguments);
visitor.visit_expr(callee_expression)
}
ExprMethodCall(ref segment, _, ref arguments) => {
visitor.visit_path_segment(expression.span, segment);
Expand Down
23 changes: 23 additions & 0 deletions src/test/ui/generator/issue-48048.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![feature(generators)]

fn main() {
let x = (|_| {},);

|| {
let x = x;

x.0({ //~ ERROR borrow may still be in use when generator yields
yield;
});
};
}
10 changes: 10 additions & 0 deletions src/test/ui/generator/issue-48048.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
error[E0626]: borrow may still be in use when generator yields
--> $DIR/issue-48048.rs:19:9
|
19 | x.0({ //~ ERROR borrow may still be in use when generator yields
| ^^^
20 | yield;
| ----- possible yield occurs here

error: aborting due to previous error

0 comments on commit 774997d

Please sign in to comment.