Merge pull request RustPython#4004 from youknowone/marshal

redesign marshal

Author: youknowone

Lib/test/test_marshal.py

@@ -93,14 +93,10 @@ def test_floats(self):
             n *= 123.4567
 
 class StringTestCase(unittest.TestCase, HelperMixin):
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_unicode(self):
         for s in ["", "Andr\xe8 Previn", "abc", " "*10000]:
             self.helper(marshal.loads(marshal.dumps(s)))
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_string(self):
         for s in ["", "Andr\xe8 Previn", "abc", " "*10000]:
             self.helper(s)
@@ -159,13 +155,9 @@ class ContainerTestCase(unittest.TestCase, HelperMixin):
          'aunicode': "Andr\xe8 Previn"
          }
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_dict(self):
         self.helper(self.d)
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_list(self):
         self.helper(list(self.d.items()))
 
@@ -178,8 +170,6 @@ def test_sets(self):
 
 
 class BufferTestCase(unittest.TestCase, HelperMixin):
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_bytearray(self):
         b = bytearray(b"abc")
         self.helper(b)
@@ -298,8 +288,6 @@ def test_large_marshal(self):
         testString = 'abc' * size
         marshal.dumps(testString)
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_invalid_longs(self):
         # Issue #7019: marshal.loads shouldn't produce unnormalized PyLongs
         invalid_string = b'l\x02\x00\x00\x00\x00\x00\x00\x00'

vm/src/builtins/dict.rs

@@ -70,10 +70,6 @@ impl PyDict {
         &self.entries
     }
 
-    pub(crate) fn from_entries(entries: DictContentType) -> Self {
-        Self { entries }
-    }
-
     // Used in update and ior.
     fn merge_object(
         dict: &DictContentType,

vm/src/dictdatatype.rs

@@ -99,22 +99,6 @@ struct DictEntry<T> {
 }
 static_assertions::assert_eq_size!(DictEntry<PyObjectRef>, Option<DictEntry<PyObjectRef>>);
 
-impl<T: Clone> DictEntry<T> {
-    pub(crate) fn as_tuple(&self) -> (PyObjectRef, T) {
-        (self.key.clone(), self.value.clone())
-    }
-}
-
-impl<T: Clone> Dict<T> {
-    pub(crate) fn as_kvpairs(&self) -> Vec<(PyObjectRef, T)> {
-        let entries = &self.inner.read().entries;
-        entries
-            .iter()
-            .filter_map(|entry| entry.as_ref().map(|dict_entry| dict_entry.as_tuple()))
-            .collect()
-    }
-}
-
 #[derive(Debug, PartialEq)]
 pub struct DictSize {
     indices_size: usize,