Fix HashTrieMap __repr__s, which need to repr() the key as well.

crate-py · Nov 29, 2023 · 8697707 · 8697707
1 parent 36738f6
commit 8697707
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rpds-py"
-version = "0.13.1"
+version = "0.13.2"
 edition = "2021"
 
 [lib]

diff --git a/src/lib.rs b/src/lib.rs
@@ -133,7 +133,10 @@ impl HashTrieMapPy {
         let contents = self.inner.into_iter().map(|(k, v)| {
             format!(
                 "{}: {}",
-                k.clone().into_py(py),
+                k.inner
+                    .call_method0(py, "__repr__")
+                    .and_then(|r| r.extract(py))
+                    .unwrap_or("<repr error>".to_owned()),
                 v.call_method0(py, "__repr__")
                     .and_then(|r| r.extract(py))
                     .unwrap_or("<repr error>".to_owned())

diff --git a/tests/test_hash_trie_map.py b/tests/test_hash_trie_map.py
@@ -287,6 +287,14 @@ def test_iteration_with_many_elements():
     assert actual_values == set(values + [12345, 54321])
 
 
+def test_repr():
+    rep = repr(HashTrieMap({"foo": "12", "": 37}))
+    assert rep in {
+        "HashTrieMap({'foo': '12', '': 37})",
+        "HashTrieMap({'': 37, 'foo': '12'})",
+    }
+
+
 def test_str():
     s = str(HashTrieMap({1: 2, 3: 4}))
     assert s == "HashTrieMap({1: 2, 3: 4})" or s == "HashTrieMap({3: 4, 1: 2})"