Generate __slots__

Author: VirxEC

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "rlbot_flatbuffers"
-version = "0.13.0"
+version = "0.13.1"
 edition = "2021"
 description = "A Python module implemented in Rust for serializing and deserializing RLBot's flatbuffers"
 repository = "https://github.com/VirxEC/rlbot_flatbuffers_py"

Cargo.toml

@@ -614,45 +614,55 @@ impl StructBindGenerator {
         write_str!(self, "    }");
     }
 
-    fn generate_long_match_args(&mut self) {
-        write_str!(self, "    #[classattr]");
-        write_str!(
-            self,
-            "    fn __match_args__(py: Python) -> Bound<pyo3::types::PyTuple> {"
-        );
-        write_str!(self, "        pyo3::types::PyTuple::new(py, [");
+    fn generate_long_args(&mut self) {
+        let funcs = ["match_args", "slots"];
+        // let funcs = ["match_args"];
 
-        for variable_info in &self.types {
-            write_fmt!(self, "            \"{}\",", variable_info.name);
+        for func in funcs {
+            write_str!(self, "    #[classattr]");
+            write_fmt!(
+                self,
+                "    fn __{func}__(py: Python) -> Bound<pyo3::types::PyTuple> {{"
+            );
+            write_str!(self, "        pyo3::types::PyTuple::new(py, [");
+    
+            for variable_info in &self.types {
+                write_fmt!(self, "            \"{}\",", variable_info.name);
+            }
+    
+            write_str!(self, "        ]).unwrap()");
+            write_str!(self, "    }\n");
         }
-
-        write_str!(self, "        ]).unwrap()");
-        write_str!(self, "    }");
     }
 
-    fn generate_match_args(&mut self) {
+    fn generate_args(&mut self) {
         if self.types.is_empty() {
             return;
         }
 
         if self.types.len() > 12 {
-            self.generate_long_match_args();
+            self.generate_long_args();
             return;
         }
 
         let sig_parts: Vec<_> = repeat("&'static str").take(self.types.len()).collect();
         let sig = sig_parts.join(", ");
 
-        write_str!(self, "    #[classattr]");
-        write_fmt!(self, "    fn __match_args__() -> ({sig},) {{",);
-        write_str!(self, "        (");
+        let funcs = ["match_args", "slots"];
+        // let funcs = ["match_args"];
 
-        for variable_info in &self.types {
-            write_fmt!(self, "            \"{}\",", variable_info.name);
+        for func in funcs {
+            write_str!(self, "    #[classattr]");
+            write_fmt!(self, "    fn __{func}__() -> ({sig},) {{",);
+            write_str!(self, "        (");
+    
+            for variable_info in &self.types {
+                write_fmt!(self, "            \"{}\",", variable_info.name);
+            }
+    
+            write_str!(self, "        )");
+            write_str!(self, "    }\n");
         }
-
-        write_str!(self, "        )");
-        write_str!(self, "    }");
     }
 
     fn generate_pack_method(&mut self) {
@@ -1186,8 +1196,7 @@ impl Generator for StructBindGenerator {
         self.generate_repr_method();
         write_str!(self, "");
 
-        self.generate_match_args();
-        write_str!(self, "");
+        self.generate_args();
 
         self.generate_pack_method();
         write_str!(self, "");

codegen/structs.rs

@@ -149,7 +149,7 @@ impl FromGil<Bools> for Py<Bool> {
 macro_rules! pynamedmodule {
     (doc: $doc:literal, name: $name:tt, classes: [$($class_name:ident),*], vars: [$(($var_name:literal, $value:expr)),*], exceptions: [$($except:expr),*]) => {
         #[doc = $doc]
-        #[pymodule]
+        #[pymodule(gil_used = false)]
         #[allow(redundant_semicolons)]
         fn $name(py: Python, m: Bound<PyModule>) -> PyResult<()> {
             $(m.add_class::<$class_name>()?);*;