bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix #19734 (ICE)

Browse source
This commit is contained in:
Adolfo Ochagavía 2014-12-12 17:34:28 +01:00
parent d2e2bd1b44
commit b99fb55f0f
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/libsyntax/ext/expand.rs
View file

@ -1026,17 +1026,18 @@ fn expand_method(m: P<ast::Method>, fld: &mut MacroExpander) -> SmallVector<P<as
|meths, mark| meths.move_map(|m| mark_method(m, mark)),
fld);
let new_methods = match maybe_new_methods {
Some(methods) => methods,
None => SmallVector::zero()
};
match maybe_new_methods {
Some(methods) => {
// expand again if necessary
let new_methods = new_methods.into_iter()
.flat_map(|m| fld.fold_method(m).into_iter()).collect();
let new_methods = methods.into_iter()
.flat_map(|m| fld.fold_method(m).into_iter())
.collect();
fld.cx.bt_pop();
new_methods
}
None => SmallVector::zero()
}
}
})
}