user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update for changes in rustc.

Browse source
This commit is contained in:
Scott Olson 2015-12-12 00:43:29 -06:00
parent caaec388b5
commit 96128cff85
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/interpreter.rs
View file

@ -161,7 +161,7 @@ impl<'a, 'tcx> Interpreter<'a, 'tcx> {
mir::Terminator::Return => break,
mir::Terminator::Goto { target } => block = target,
mir::Terminator::Call { ref data, targets } => {
mir::Terminator::Call { ref data, targets: (success_target, _panic_target) } => {
let mir::CallData { ref destination, ref func, ref args } = *data;
let ptr = self.eval_lvalue(destination);
@ -174,16 +174,16 @@ impl<'a, 'tcx> Interpreter<'a, 'tcx> {
args.iter().map(|arg| self.eval_operand(arg)).collect();
self.call(mir, &arg_vals, ptr);
block = targets[0];
block = success_target
} else {
panic!("tried to call a non-function value: {:?}", func_val);
}
}
mir::Terminator::If { ref cond, targets } => {
mir::Terminator::If { ref cond, targets: (then_target, else_target) } => {
match self.eval_operand(cond) {
Value::Bool(true) => block = targets[0],
Value::Bool(false) => block = targets[1],
Value::Bool(true) => block = then_target,
Value::Bool(false) => block = else_target,
cond_val => panic!("Non-boolean `if` condition value: {:?}", cond_val),
}
}