From b43af3358b7904f4bb43755c36018a7d8f177f05 Mon Sep 17 00:00:00 2001 From: Aviv Palivoda Date: Sat, 31 Aug 2019 16:51:04 +0300 Subject: [PATCH] Convert hash, hex --- vm/src/builtins.rs | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/vm/src/builtins.rs b/vm/src/builtins.rs index b51626adc..182c4e810 100644 --- a/vm/src/builtins.rs +++ b/vm/src/builtins.rs @@ -301,17 +301,14 @@ fn builtin_hasattr(obj: PyObjectRef, attr: PyStringRef, vm: &VirtualMachine) -> } } -fn builtin_hash(vm: &VirtualMachine, args: PyFuncArgs) -> PyResult { - arg_check!(vm, args, required = [(obj, None)]); - vm._hash(obj).and_then(|v| Ok(vm.new_int(v))) +fn builtin_hash(obj: PyObjectRef, vm: &VirtualMachine) -> PyResult { + vm._hash(&obj).and_then(|v| Ok(vm.new_int(v))) } // builtin_help -fn builtin_hex(vm: &VirtualMachine, args: PyFuncArgs) -> PyResult { - arg_check!(vm, args, required = [(number, Some(vm.ctx.int_type()))]); - - let n = objint::get_value(number); +fn builtin_hex(number: PyIntRef, vm: &VirtualMachine) -> PyResult { + let n = number.as_bigint(); let s = if n.is_negative() { format!("-0x{:x}", n.abs()) } else {