Directly add classes to lib.rs

Author: VirxEC

codegen/class_inject.rs

@@ -0,0 +1,24 @@
+use std::{fs, io};
+
+use crate::PythonBindType;
+
+pub fn classes_to_lib_rs(type_data: &[PythonBindType]) -> io::Result<()> {
+    let mut class_names = type_data
+        .iter()
+        .map(|generator| format!("        {}", generator.struct_name()))
+        .collect::<Vec<_>>();
+    class_names.sort();
+
+    let file_contents = format!("    classes: [\n{}\n    ],", class_names.join(",\n"));
+
+    let mut lib_rs = fs::read_to_string("src/lib.rs")?;
+
+    let start = lib_rs.find("    classes: [\n").unwrap();
+    let end = lib_rs[start..].find("],").unwrap() + 2;
+
+    lib_rs.replace_range(start..start + end, &file_contents);
+
+    fs::write("src/lib.rs", lib_rs)?;
+
+    Ok(())
+}

codegen/main.rs

@@ -1,3 +1,4 @@
+mod class_inject;
 mod enums;
 mod generator;
 mod pyi;
@@ -161,20 +162,6 @@ fn mod_rs_generator(type_data: &[PythonBindType]) -> io::Result<()> {
     Ok(())
 }
 
-fn class_names_txt_generator(type_data: &[PythonBindType]) -> io::Result<()> {
-    let mut class_names = type_data
-        .iter()
-        .map(|generator| format!("    {}", generator.struct_name()))
-        .collect::<Vec<_>>();
-    class_names.sort();
-
-    let file_contents = format!("[\n{}\n]", class_names.join(",\n"));
-
-    fs::write("classes.txt", file_contents)?;
-
-    Ok(())
-}
-
 fn run_flatc() -> io::Result<()> {
     println!("cargo:rerun-if-changed=flatbuffers-schema/comms.fbs");
     println!("cargo:rerun-if-changed=flatbuffers-schema/event.fbs");
@@ -240,7 +227,7 @@ fn main() -> io::Result<()> {
 
     mod_rs_generator(&type_data)?;
     pyi::generator(&type_data)?;
-    class_names_txt_generator(&type_data)?;
+    class_inject::classes_to_lib_rs(&type_data)?;
 
     Ok(())
 }

codegen/structs.rs

@@ -243,11 +243,10 @@ impl StructBindGenerator {
 
     fn generate_new_method(&mut self) {
         write_str!(self, "    #[new]");
-        write_str!(self, "    #[allow(clippy::too_many_arguments)]");
 
         if self.types.is_empty() {
             write_str!(self, "    pub fn new() -> Self {");
-            write_str!(self, "        Self::default()");
+            write_str!(self, "        Self {}");
             write_str!(self, "    }");
             return;
         }
@@ -289,6 +288,11 @@ impl StructBindGenerator {
             signature_parts.push(sig_part);
         }
 
+        let max_num_types = if needs_python { 6 } else { 7 };
+        if self.types.len() > max_num_types {
+            write_str!(self, "    #[allow(clippy::too_many_arguments)]");
+        }
+
         write_fmt!(self, "    #[pyo3(signature = ({}))]", signature_parts.join(", "));
         write_str!(self, "    pub fn new(");
 

pytest.py

@@ -15,7 +15,7 @@ def random_string():
 
 def random_player_config():
     return PlayerConfiguration(
-        variety=PlayerClass(Psyonix(1.0)),
+        variety=Psyonix(1.0),
         name=random_string(),
         location=random_string(),
         run_command=random_string(),
@@ -120,6 +120,12 @@ def random_script_config():
         )
     )
 
+    match renderPolyLine.variety.item:
+        case PolyLine3D():
+            assert len(renderPolyLine.variety.item.points) == 2048
+        case _:
+            assert False
+
     data = renderPolyLine.pack()
     print(f"RenderMessage size: {len(data)} bytes")