Fix usize not using the same hash as PyInt when used as key into a dictionary

Author: hbina

common/src/hash.rs

@@ -53,6 +53,15 @@ impl HashSecret {
         fix_sentinel(mod_int(self.hash_one(data) as _))
     }
 
+    pub fn hash_integer<T>(&self, data: T) -> PyHash
+    where
+        T: Into<BigInt>,
+    {
+        let bigint = data.into();
+        let result = hash_bigint(&bigint);
+        result
+    }
+
     pub fn hash_iter<'a, T: 'a, I, F, E>(&self, iter: I, hash_func: F) -> Result<PyHash, E>
     where
         I: IntoIterator<Item = &'a T>,

extra_tests/snippets/builtin_object.py

@@ -1,6 +1,7 @@
 class MyObject:
     pass
 
+
 assert not MyObject() == MyObject()
 assert MyObject() != MyObject()
 myobj = MyObject()
@@ -24,3 +25,10 @@ class MyObject:
 assert not hasattr(obj, 'a')
 obj.__dict__ = {'a': 1}
 assert obj.a == 1
+
+# Value inside the formatter goes through a different path of resolution.
+# Check that it still works all the same
+d = {
+    0: "ab",
+}
+assert "ab ab" == "{k[0]} {vv}".format(k=d, vv=d[0])

vm/src/dict_inner.rs

@@ -994,7 +994,7 @@ impl DictKey for usize {
     }
 
     fn key_hash(&self, vm: &VirtualMachine) -> PyResult<HashValue> {
-        Ok(vm.state.hash_secret.hash_value(self))
+        Ok(vm.state.hash_secret.hash_integer(*self))
     }
 
     fn key_is(&self, _other: &PyObject) -> bool {