mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rustc_borrowck: unbox closures used in function arguments

Browse Source
This commit is contained in:
Jorge Aparicio 2014-12-30 20:13:30 -05:00
parent 24b49228f0
commit bcc2120c21
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/librustc_borrowck/borrowck/move_data.rs
View File

@ -521,15 +521,17 @@ impl<'tcx> MoveData<'tcx> {
return true;
}
// FIXME(#19596) unbox `f`
fn each_extending_path(&self, index: MovePathIndex, f: |MovePathIndex| -> bool) -> bool {
if !f(index) {
// FIXME(#19596) This is a workaround, but there should be better way to do this
fn each_extending_path_<F>(&self, index: MovePathIndex, f: &mut F) -> bool where
F: FnMut(MovePathIndex) -> bool,
{
if !(*f)(index) {
return false;
}
let mut p = self.path_first_child(index);
while p != InvalidMovePathIndex {
if !self.each_extending_path(p, |x| f(x)) {
if !self.each_extending_path_(p, f) {
return false;
}
p = self.path_next_sibling(p);
@ -538,6 +540,12 @@ impl<'tcx> MoveData<'tcx> {
return true;
}
fn each_extending_path<F>(&self, index: MovePathIndex, mut f: F) -> bool where
F: FnMut(MovePathIndex) -> bool,
{
self.each_extending_path_(index, &mut f)
}
fn each_applicable_move<F>(&self, index0: MovePathIndex, mut f: F) -> bool where
F: FnMut(MoveIndex) -> bool,
{