diff options
| author | bors <bors@rust-lang.org> | 2013-06-01 17:13:39 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-06-01 17:13:39 -0700 |
| commit | 63417daea4058646ef07a880edc79653ddc16bbf (patch) | |
| tree | 5d6e75e2ee5567640812d8f4132122d69fc25da1 /src/libsyntax/parse/classify.rs | |
| parent | 24e85ac82d000a71276eb4cf2090bd176a3638bf (diff) | |
| parent | 23808efd11be2a9f964373bd8d684d98565e58d0 (diff) | |
| download | rust-63417daea4058646ef07a880edc79653ddc16bbf.tar.gz rust-63417daea4058646ef07a880edc79653ddc16bbf.zip | |
auto merge of #6885 : erickt/rust/move-callee_id, r=catamorphism
The `callee_id` in `ast::expr` in only used in a couple expression variants. This moves the `callee_id` into those branches to make it more clear when its should be used. Also, it fixes a bug in a std::run test when there is a symlink in the path rust where was checked out.
Diffstat (limited to 'src/libsyntax/parse/classify.rs')
| -rw-r--r-- | src/libsyntax/parse/classify.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/parse/classify.rs b/src/libsyntax/parse/classify.rs index e04914c0f1e..62b36b12f26 100644 --- a/src/libsyntax/parse/classify.rs +++ b/src/libsyntax/parse/classify.rs @@ -31,8 +31,8 @@ pub fn expr_requires_semi_to_be_stmt(e: @ast::expr) -> bool { | ast::expr_loop(*) | ast::expr_call(_, _, ast::DoSugar) | ast::expr_call(_, _, ast::ForSugar) - | ast::expr_method_call(_, _, _, _, ast::DoSugar) - | ast::expr_method_call(_, _, _, _, ast::ForSugar) => false, + | ast::expr_method_call(_, _, _, _, _, ast::DoSugar) + | ast::expr_method_call(_, _, _, _, _, ast::ForSugar) => false, _ => true } } |