Rust-related/RustPython
1
0
Fork 1
mirror of https://github.com/RustPython/RustPython.git synced 2026-06-17 01:51:39 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge with master branch

Browse Source
This commit is contained in:
Windel Bouwman
2018-09-09 20:36:42 +02:00
parent 9f06835ca0 903bf41a7a
commit 0acfc10a09
3 changed files with 41 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vm/src/obj/objint.rs
View File

@@ -156,7 +156,7 @@ fn int_truediv(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
} else if objtype::isinstance(i2, vm.ctx.float_type()) {
Ok(vm.ctx.new_float(v1 as f64 / objfloat::get_value(i2)))
} else {
Err(vm.new_type_error(format!("Cannot multiply {:?} and {:?}", i, i2)))
Err(vm.new_type_error(format!("Cannot divide {:?} and {:?}", i, i2)))
}
}
@@ -188,7 +188,7 @@ fn int_pow(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
let v2 = objfloat::get_value(i2);
Ok(vm.ctx.new_float((v1 as f64).powf(v2)))
} else {
Err(vm.new_type_error(format!("Cannot modulo {:?} and {:?}", i, i2)))
Err(vm.new_type_error(format!("Cannot raise power {:?} and {:?}", i, i2)))
}
}