Minor cleanup

Author: VirxEC

Cargo.lock

@@ -63,7 +63,7 @@ impl PythonBindType {
         "PlayerClass",
         "GameMessage",
         "CollisionShape",
-        "RelativeAnchor",
+        "RelativeRAnchor",
         "RenderType",
     ];
 
@@ -82,6 +82,7 @@ impl PythonBindType {
             struct_name.push_str(&c[1..]);
         }
         struct_name = struct_name
+            .replace("Ranchor", "RAnchor")
             .replace("Rlbot", "RLBot")
             .replace("Halign", "HAlign")
             .replace("Valign", "VAlign");
@@ -180,20 +181,23 @@ fn run_flatc() -> io::Result<()> {
 
     let schema_folder_str = schema_folder.display();
 
-    Command::new(format!("{schema_folder_str}/{FLATC_BINARY}"))
-        .args([
-            "--rust",
-            "--gen-object-api",
-            "--gen-all",
-            "--filename-suffix",
-            "",
-            "--rust-module-root-file",
-            "-o",
-            OUT_FOLDER,
-            &format!("{schema_folder_str}/rlbot.fbs"),
-        ])
-        .spawn()?
-        .wait()?;
+    let mut proc = Command::new(format!("{schema_folder_str}/{FLATC_BINARY}"));
+
+    proc.args([
+        "--rust",
+        "--gen-object-api",
+        "--gen-all",
+        "--filename-suffix",
+        "",
+        "--rust-module-root-file",
+        "-o",
+        OUT_FOLDER,
+        &format!("{schema_folder_str}/rlbot.fbs"),
+    ])
+    .spawn()?
+    .wait()?;
+
+    assert!(proc.status()?.success(), "flatc failed to run");
 
     Ok(())
 }

codegen/main.rs

@@ -84,10 +84,7 @@ pub fn generator(type_data: &[PythonBindType]) -> io::Result<()> {
                 );
                 write_str!(file, "        \"\"\"\n");
                 write_str!(file, "    def __int__(self) -> int: ...");
-                write_fmt!(
-                    file,
-                    "    def __eq__(self, other: {type_name}) -> bool: ..."
-                );
+                write_fmt!(file, "    def __eq__(self, other: {type_name}) -> bool: ...");
                 write_str!(file, "    def __hash__(self) -> str: ...");
             }
             PythonBindType::Struct(gen) => {

codegen/pyi.rs

@@ -102,7 +102,7 @@ impl UnionBindGenerator {
                     self.struct_name
                 );
             } else {
-                write_str!(self, "            None => String::from(\"None\"),");
+                write_str!(self, "            None => crate::none_str(),");
             }
         }
 

codegen/unions.rs

@@ -64,8 +64,8 @@ def random_script_config():
 
     render_type = RenderMessage(
         Line3D(
-            Anchor(Vector3(0, 0, 0)),
-            Anchor(relative=CarAnchor(0, MyVector(1, 1, 1))),
+            RAnchor(),
+            RAnchor(relative=CarRAnchor(0, MyVector(1, 1, 1))),
             Color(255),
         )
     )

pytest.py

@@ -165,12 +165,11 @@ pynamedmodule! {
     name: rlbot_flatbuffers,
     classes: [
         AirState,
-        Anchor,
-        BallAnchor,
         BallBouncinessOption,
         BallInfo,
         BallMaxSpeedOption,
         BallPrediction,
+        BallRAnchor,
         BallSizeOption,
         BallTypeOption,
         BallWeightOption,
@@ -180,7 +179,7 @@ pynamedmodule! {
         BoostPadState,
         BoostStrengthOption,
         BoxShape,
-        CarAnchor,
+        CarRAnchor,
         CollisionShape,
         Color,
         ConsoleCommand,
@@ -229,9 +228,10 @@ pynamedmodule! {
         PolyLine3D,
         PredictionSlice,
         Psyonix,
+        RAnchor,
         RLBot,
         ReadyMessage,
-        RelativeAnchor,
+        RelativeRAnchor,
         RemoveRenderGroup,
         RenderGroup,
         RenderMessage,