From 44b419b82084e1dc1abd8f8cb4b603fe1c43483c Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Tue, 2 Dec 2014 15:17:55 -0500 Subject: [PATCH] librustc_trans: fix fallout --- src/librustc_trans/trans/basic_block.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/librustc_trans/trans/basic_block.rs b/src/librustc_trans/trans/basic_block.rs index b55c268d9a90..1bd29038fdf6 100644 --- a/src/librustc_trans/trans/basic_block.rs +++ b/src/librustc_trans/trans/basic_block.rs @@ -17,7 +17,7 @@ pub struct BasicBlock(pub BasicBlockRef); impl Copy for BasicBlock {} -pub type Preds<'a> = Map<'a, Value, BasicBlock, Filter<'a, Value, Users>>; +pub type Preds<'a> = Map, fn(Value) -> BasicBlock>; /// Wrapper for LLVM BasicBlockRef impl BasicBlock { @@ -32,9 +32,11 @@ impl BasicBlock { } pub fn pred_iter(self) -> Preds<'static> { + fn get_parent(user: Value) -> BasicBlock { user.get_parent().unwrap() } + self.as_value().user_iter() .filter(|user| user.is_a_terminator_inst()) - .map(|user| user.get_parent().unwrap()) + .map(get_parent) } pub fn get_single_predecessor(self) -> Option {