Skip to content

Commit

Permalink
rustc: Allow return to return from a closure.
Browse files Browse the repository at this point in the history
With the old `for` gone, this behaviour is no longer conflicting with
that use of `return` in closures, and this allows shortcircuiting in a
closure.
  • Loading branch information
huonw committed Dec 18, 2013
1 parent 47c9a35 commit 6876916
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 21 deletions.
6 changes: 0 additions & 6 deletions src/librustc/middle/check_loop.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,6 @@ impl Visitor<Context> for CheckLoopVisitor {
}
ast::ExprBreak(_) => self.require_loop("break", cx, e.span),
ast::ExprAgain(_) => self.require_loop("continue", cx, e.span),
ast::ExprRet(oe) => {
if cx == Closure {
self.tcx.sess.span_err(e.span, "`return` in a closure");
}
visit::walk_expr_opt(self, oe, cx);
}
_ => visit::walk_expr(self, e, cx)
}
}
Expand Down
15 changes: 0 additions & 15 deletions src/test/compile-fail/return-in-block-function.rs

This file was deleted.

41 changes: 41 additions & 0 deletions src/test/run-pass/return-from-closure.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
// Copyright 2013 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.

// just to make sure that `return` is only returning from the closure,
// not the surrounding function.
static mut calls: uint = 0;

fn surrounding() {
let return_works = |n: int| {
unsafe { calls += 1 }

if n >= 0 { return; }
fail!()
};

return_works(10);
return_works(20);


let return_works_proc = proc(n: int) {
unsafe { calls += 1 }

if n >= 0 { return; }
fail!()
};

return_works_proc(10);
}

pub fn main() {
surrounding();

assert_eq!(unsafe {calls}, 3);
}

5 comments on commit 6876916

@bors
Copy link
Contributor

@bors bors commented on 6876916 Dec 18, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from alexcrichton
at huonw@6876916

@bors
Copy link
Contributor

@bors bors commented on 6876916 Dec 18, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging huonw/rust/return-from-closures = 6876916 into auto

@bors
Copy link
Contributor

@bors bors commented on 6876916 Dec 18, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

huonw/rust/return-from-closures = 6876916 merged ok, testing candidate = c335734

@bors
Copy link
Contributor

@bors bors commented on 6876916 Dec 18, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on 6876916 Dec 18, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = c335734

Please sign in to comment.