RustPython · youknowone · Aug 28, 2025 · Aug 8, 2025 · Aug 26, 2025 · Aug 26, 2025
diff --git a/Lib/test/test_patma.py b/Lib/test/test_patma.py
diff --git a/compiler/codegen/src/compile.rs b/compiler/codegen/src/compile.rs
diff --git a/extra_tests/snippets/syntax_match.py b/extra_tests/snippets/syntax_match.py
@@ -64,18 +64,46 @@ def test_or(i):
 
 match data:
     case {"a": x, "b": y}:
+        assert x == 1, x
+        assert y == 2, y
+    case _:
+        assert False
+
+# test mapping with rest
+match data:
+    case {"a": x, **rest}:
+        assert x == 1
+        assert rest == {"b": 2}
+    case _:
+        assert False
+
+# test empty rest
+data2 = {"a": 1}
+match data2:
+    case {"a": x, **rest}:
+        assert x == 1
+        assert rest == {}
+    case _:
+        assert False
+
+# test rest with multiple keys
+data3 = {"a": 1, "b": 2, "c": 3, "d": 4}
+match data3:
+    case {"a": x, "b": y, **rest}:
         assert x == 1
         assert y == 2
+        assert rest == {"c": 3, "d": 4}
     case _:
         assert False
 
-# test mapping with rest (TODO: implement **rest pattern)
-# match data:
-#     case {"a": x, **rest}:
-#         assert x == 1
-#         assert rest == {"b": 2}
-#     case _:
-#         assert False
+match data3:
+    case {"a": x, "b": y, "c": z, **rest}:
+        assert x == 1
+        assert y == 2
+        assert z == 3
+        assert rest == {"d": 4}
+    case _:
+        assert False
 
 # test mapping pattern with wildcard fallback (reproduces wheelinfo.py issue)
 test_dict = {"sha256": "abc123"}
@@ -118,7 +146,6 @@ def test_mapping_comprehensive():
             cap_x = cap_y = None
     assert cap_x == 1, f"Expected x=1, got {cap_x}"
     assert cap_y == 2, f"Expected y=2, got {cap_y}"
-    print("Comprehensive mapping tests passed!")
 
 
 test_mapping_comprehensive()
diff --git a/vm/src/builtins/bool.rs b/vm/src/builtins/bool.rs
@@ -109,7 +109,7 @@ impl Constructor for PyBool {
     }
 }
 
-#[pyclass(with(Constructor, AsNumber, Representable))]
+#[pyclass(with(Constructor, AsNumber, Representable), flags(_MATCH_SELF))]
 impl PyBool {
     #[pymethod]
     fn __format__(obj: PyObjectRef, spec: PyStrRef, vm: &VirtualMachine) -> PyResult<String> {

diff --git a/vm/src/builtins/bytearray.rs b/vm/src/builtins/bytearray.rs
@@ -170,7 +170,7 @@ impl PyByteArray {
 }
 
 #[pyclass(
-    flags(BASETYPE),
+    flags(BASETYPE, _MATCH_SELF),
     with(
         Py,
         PyRef,

diff --git a/vm/src/builtins/bytes.rs b/vm/src/builtins/bytes.rs
@@ -132,7 +132,7 @@ impl PyRef<PyBytes> {
 }
 
 #[pyclass(
-    flags(BASETYPE),
+    flags(BASETYPE, _MATCH_SELF),
     with(
         Py,
         PyRef,

diff --git a/vm/src/builtins/dict.rs b/vm/src/builtins/dict.rs
@@ -176,7 +176,7 @@ impl PyDict {
         AsMapping,
         Representable
     ),
-    flags(BASETYPE, MAPPING)
+    flags(BASETYPE, MAPPING, _MATCH_SELF)
 )]
 impl PyDict {
     #[pyclassmethod]

diff --git a/vm/src/builtins/float.rs b/vm/src/builtins/float.rs
@@ -201,7 +201,7 @@ fn float_from_string(val: PyObjectRef, vm: &VirtualMachine) -> PyResult<f64> {
 }
 
 #[pyclass(
-    flags(BASETYPE),
+    flags(BASETYPE, _MATCH_SELF),
     with(Comparable, Hashable, Constructor, AsNumber, Representable)
 )]
 impl PyFloat {

diff --git a/vm/src/builtins/int.rs b/vm/src/builtins/int.rs
@@ -317,7 +317,7 @@ impl PyInt {
 }
 
 #[pyclass(
-    flags(BASETYPE),
+    flags(BASETYPE, _MATCH_SELF),
     with(PyRef, Comparable, Hashable, Constructor, AsNumber, Representable)
 )]
 impl PyInt {

diff --git a/vm/src/builtins/list.rs b/vm/src/builtins/list.rs
@@ -109,7 +109,7 @@ pub type PyListRef = PyRef<PyList>;
         AsSequence,
         Representable
     ),
-    flags(BASETYPE, SEQUENCE)
+    flags(BASETYPE, SEQUENCE, _MATCH_SELF)
 )]
 impl PyList {
     #[pymethod]

diff --git a/vm/src/builtins/set.rs b/vm/src/builtins/set.rs
@@ -529,7 +529,7 @@ fn reduce_set(
         AsNumber,
         Representable
     ),
-    flags(BASETYPE)
+    flags(BASETYPE, _MATCH_SELF)
 )]
 impl PySet {
     #[pymethod]
@@ -946,7 +946,7 @@ impl Constructor for PyFrozenSet {
 }
 
 #[pyclass(
-    flags(BASETYPE),
+    flags(BASETYPE, _MATCH_SELF),
     with(
         Constructor,
         AsSequence,

diff --git a/vm/src/builtins/str.rs b/vm/src/builtins/str.rs
@@ -521,7 +521,7 @@ impl Py<PyStr> {
 }
 
 #[pyclass(
-    flags(BASETYPE),
+    flags(BASETYPE, _MATCH_SELF),
     with(
         PyRef,
         AsMapping,

diff --git a/vm/src/builtins/tuple.rs b/vm/src/builtins/tuple.rs
@@ -244,7 +244,7 @@ impl<T> PyTuple<PyRef<T>> {
 }
 
 #[pyclass(
-    flags(BASETYPE, SEQUENCE),
+    flags(BASETYPE, SEQUENCE, _MATCH_SELF),
     with(
         AsMapping,
         AsSequence,

diff --git a/vm/src/builtins/type.rs b/vm/src/builtins/type.rs
@@ -232,13 +232,25 @@ impl PyType {
         linearise_mro(mros)
     }
 
-    /// Inherit SEQUENCE and MAPPING flags from base class (CPython: inherit_patma_flags)
-    fn inherit_patma_flags(slots: &mut PyTypeSlots, base: &PyRef<Self>) {
+    /// Inherit SEQUENCE and MAPPING flags from base classes
+    /// Check all bases in order and inherit the first SEQUENCE or MAPPING flag found
+    fn inherit_patma_flags(slots: &mut PyTypeSlots, bases: &[PyRef<Self>]) {
         const COLLECTION_FLAGS: PyTypeFlags = PyTypeFlags::from_bits_truncate(
             PyTypeFlags::SEQUENCE.bits() | PyTypeFlags::MAPPING.bits(),
         );
-        if !slots.flags.intersects(COLLECTION_FLAGS) {
-            slots.flags |= base.slots.flags & COLLECTION_FLAGS;
+
+        // If flags are already set, don't override
+        if slots.flags.intersects(COLLECTION_FLAGS) {
+            return;
+        }
+
+        // Check each base in order and inherit the first collection flag found
+        for base in bases {
+            let base_flags = base.slots.flags & COLLECTION_FLAGS;
+            if !base_flags.is_empty() {
+                slots.flags |= base_flags;
+                return;
+            }
         }
     }
 
@@ -300,8 +312,8 @@ impl PyType {
             slots.flags |= PyTypeFlags::HAS_DICT
         }
 
-        // Inherit SEQUENCE and MAPPING flags from base class
-        Self::inherit_patma_flags(&mut slots, &base);
+        // Inherit SEQUENCE and MAPPING flags from base classes
+        Self::inherit_patma_flags(&mut slots, &bases);
 
         // Check for __abc_tpflags__ from ABCMeta (for collections.abc.Sequence, Mapping, etc.)
         Self::check_abc_tpflags(&mut slots, &attrs, &bases, ctx);
@@ -359,7 +371,8 @@ impl PyType {
         }
 
         // Inherit SEQUENCE and MAPPING flags from base class
-        Self::inherit_patma_flags(&mut slots, &base);
+        // For static types, we only have a single base
+        Self::inherit_patma_flags(&mut slots, std::slice::from_ref(&base));
 
         if slots.basicsize == 0 {
             slots.basicsize = base.slots.basicsize;
-Original file line number
+Diff line change
@@ Expand Up / @@ -170,7 +170,7 @@ impl PyByteArray { @@
     }
     #[pyclass(
-        flags(BASETYPE),
+        flags(BASETYPE, _MATCH_SELF),
         with(
             Py,
             PyRef,
@@ Expand Down @@