Merge branch 'RustPython:main' into main

sthagen · web-flow · commit b9c4ab87f81a · 2025-05-01T20:34:19.000+02:00
diff --git a/Lib/test/test_fstring.py b/Lib/test/test_fstring.py
@@ -1631,8 +1631,6 @@ def test_empty_format_specifier(self):
         self.assertEqual(f"{x!s:}", "test")
         self.assertEqual(f"{x!r:}", "'test'")
 
-    # TODO: RUSTPYTHON d[0] error
-    @unittest.expectedFailure
     def test_str_format_differences(self):
         d = {
             "a": "string",
diff --git a/common/src/hash.rs b/common/src/hash.rs
@@ -139,6 +139,11 @@ pub fn hash_bigint(value: &BigInt) -> PyHash {
     fix_sentinel(ret)
 }
 
+#[inline]
+pub fn hash_usize(data: usize) -> PyHash {
+    fix_sentinel(mod_int(data as i64))
+}
+
 #[inline(always)]
 pub fn fix_sentinel(x: PyHash) -> PyHash {
     if x == SENTINEL { -2 } else { x }
diff --git a/extra_tests/snippets/builtin_object.py b/extra_tests/snippets/builtin_object.py
@@ -24,3 +24,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])
diff --git a/vm/src/dict_inner.rs b/vm/src/dict_inner.rs
@@ -993,8 +993,8 @@ impl DictKey for usize {
         *self
     }
 
-    fn key_hash(&self, vm: &VirtualMachine) -> PyResult<HashValue> {
-        Ok(vm.state.hash_secret.hash_value(self))
+    fn key_hash(&self, _vm: &VirtualMachine) -> PyResult<HashValue> {
+        Ok(hash::hash_usize(*self))
     }
 
     fn key_is(&self, _other: &PyObject) -> bool {

Original file line number	Diff line number	Diff line change
`@@ -993,8 +993,8 @@ impl DictKey for usize {`
`993`	`993`	`*self`
`994`	`994`	`}`
`995`	`995`
`996`		`- fn key_hash(&self, vm: &VirtualMachine) -> PyResult<HashValue> {`
`997`		`- Ok(vm.state.hash_secret.hash_value(self))`
	`996`	`+ fn key_hash(&self, _vm: &VirtualMachine) -> PyResult<HashValue> {`
	`997`	`+ Ok(hash::hash_usize(*self))`
`998`	`998`	`}`
`999`	`999`
`1000`	`1000`	`fn key_is(&self, _other: &PyObject) -> bool {`