Merge branch 'modular:main' into main

modular · Feb 4, 2025 · 7907b3b · 7907b3b
2 parents 3ec610f + e064839
commit 7907b3b
Show file tree

Hide file tree

Showing 7 changed files with 571 additions and 586 deletions.
diff --git a/examples/life/magic.lock b/examples/life/magic.lock
diff --git a/examples/magic.lock b/examples/magic.lock
diff --git a/examples/operators/magic.lock b/examples/operators/magic.lock
diff --git a/examples/testing/magic.lock b/examples/testing/magic.lock
diff --git a/magic.lock b/magic.lock
diff --git a/stdlib/src/python/_bindings.mojo b/stdlib/src/python/_bindings.mojo
@@ -107,15 +107,15 @@ fn python_type_object[
     # Zeroed item terminator
     slots.append(PyType_Slot.null())
 
-    var type_spec = PyType_Spec {
+    var type_spec = PyType_Spec(
         # FIXME(MOCO-1306): This should be `T.__name__`.
-        name: type_name.unsafe_cstr_ptr(),
-        basicsize: sizeof[PyMojoObject[T]](),
-        itemsize: 0,
-        flags: Py_TPFLAGS_DEFAULT,
+        type_name.unsafe_cstr_ptr(),
+        sizeof[PyMojoObject[T]](),
+        0,
+        Py_TPFLAGS_DEFAULT,
         # Note: This pointer is only "read-only" by PyType_FromSpec.
-        slots: slots.unsafe_ptr(),
-    }
+        slots.unsafe_ptr(),
+    )
 
     # Construct a Python 'type' object from our type spec.
     var type_obj = cpython.PyType_FromSpec(UnsafePointer.address_of(type_spec))

diff --git a/stdlib/src/python/_cpython.mojo b/stdlib/src/python/_cpython.mojo
@@ -449,7 +449,7 @@ struct PyType_Slot:
 
     @staticmethod
     fn null() -> Self:
-        return PyType_Slot {slot: 0, pfunc: OpaquePointer()}
+        return PyType_Slot(0, OpaquePointer())
 
 
 @value
@@ -1055,12 +1055,12 @@ struct CPython:
         )
 
         _ = v
-        return PyKeysValuePair {
-            key: key,
-            value: value,
-            position: position.take_pointee(),
-            success: result == 1,
-        }
+        return PyKeysValuePair(
+            key,
+            value,
+            position.take_pointee(),
+            result == 1,
+        )
 
     # ===-------------------------------------------------------------------===#
     # Python Module operations