Fix hash_complex's hash function

Author: jopemachine

common/src/hash.rs

@@ -140,11 +140,11 @@ pub fn hash_float(value: f64) -> Option<PyHash> {
     Some(fix_sentinel(x as PyHash * value.signum() as PyHash))
 }
 
-pub fn hash_complex(value: &Complex64) -> PyHash {
-    let re_hash = hash_float(value.re).unwrap();
-    let im_hash = hash_float(value.im).unwrap();
+pub fn hash_complex(value: &Complex64) -> Option<PyHash> {
+    let re_hash = hash_float(value.re)?;
+    let im_hash = hash_float(value.im)?;
     let Wrapping(ret) = Wrapping(re_hash) + Wrapping(im_hash) * Wrapping(IMAG);
-    fix_sentinel(ret)
+    Some(fix_sentinel(ret))
 }
 
 pub fn hash_iter_unordered<'a, T: 'a, I, F, E>(iter: I, hashf: F) -> Result<PyHash, E>

vm/src/builtins/complex.rs

@@ -417,7 +417,12 @@ impl Comparable for PyComplex {
 impl Hashable for PyComplex {
     #[inline]
     fn hash(zelf: &crate::Py<Self>, _vm: &VirtualMachine) -> PyResult<hash::PyHash> {
-        Ok(hash::hash_complex(&zelf.value))
+        match hash::hash_complex(&zelf.value) {
+            Some(value) => Ok(value),
+            None => Ok(hash::hash_pointer(
+                zelf as *const _ as *const std::ffi::c_void,
+            )),
+        }
     }
 }
 

vm/src/builtins/float.rs

@@ -541,7 +541,9 @@ impl Hashable for PyFloat {
     fn hash(zelf: &crate::Py<Self>, _vm: &VirtualMachine) -> PyResult<hash::PyHash> {
         match hash::hash_float(zelf.to_f64()) {
             Some(value) => Ok(value),
-            None => Ok(hash::hash_pointer(zelf as *const _ as *const std::ffi::c_void)),
+            None => Ok(hash::hash_pointer(
+                zelf as *const _ as *const std::ffi::c_void,
+            )),
         }
     }
 }