Better __str__/__repr__ for enums

Fix enums having `pack`/`unpack` in Python type hints

Author: VirxEC

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "rlbot-flatbuffers-py"
-version = "0.4.1"
+version = "0.4.2"
 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

@@ -6,7 +6,7 @@ A Python module implemented in Rust for serializing and deserializing RLBot's fl
 
 To provide a fast, safe, and easy to use Python module for serializing and deserializing RLBot's flatbuffers.
 
-A majority of the code is generated in the `build.rs` upon first compile and thrown into `src/python`.
+A majority of the code is generated in the `codegen/` upon first compile and thrown into `src/python`.
 
 This includes the code generated by `flatc` (living in `src/generated`), the Python wrapper binds to the generated Rust code, and the Python type hints (`rlbot_flatbuffers.pyi`).
 
@@ -76,7 +76,10 @@ def handle_packet(packet: flat.GameTickPacket):
 
 The goal of the above was to feel familiar to RLBot v4 while providing a more Pythonic interface.
 
-- All enum types are hashable and can be used in a set, allowing for easy checks against them.
+- All classes (not enums and unions) implement `__match_args__` for easy destructuring via the `match`/`case` pattern.
+  - Enums and unions and can still be used to match against the type,
+    they just can't be destructured.
 - Every class implements `__str__`, `__repr__`, and `__hash__` methods.
-  - All enums also implement `__int__` and `__richcmp__`.
-- Lists no longer have `num_x` fields accompanying them, they are just Python lists of the appropriate length.
+  - All enums also implement `__int__` and `__eq__`.
+- Lists no longer have `num_x` fields accompanying them,
+  they are just Python lists of the appropriate length.

README.md

@@ -193,17 +193,13 @@ impl EnumBindGenerator {
 
     fn generate_str_method(&mut self) {
         write_str!(self, "    pub fn __str__(&self) -> String {");
-        write_str!(self, "        format!(\"{self:?}\")");
+        write_str!(self, "        self.__repr__()");
         write_str!(self, "    }");
     }
 
     fn generate_repr_method(&mut self) {
         write_str!(self, "    pub fn __repr__(&self) -> String {");
-        write_fmt!(
-            self,
-            "        format!(\"{}(value={{}})\", *self as u8)",
-            self.struct_name
-        );
+        write_fmt!(self, "        format!(\"{}.{{self:?}}\")", self.struct_name);
         write_str!(self, "    }");
     }
 }

codegen/enums.rs

@@ -219,24 +219,21 @@ pub fn generator(type_data: &[PythonBindType]) -> io::Result<()> {
 
                     write_str!(file, "    ): ...");
                 }
+
+                write_str!(file, "    def pack(self) -> bytes: ...");
+                write_str!(file, "    @staticmethod");
+                write_fmt!(file, "    def unpack(data: bytes) -> {type_name}:");
+                write_str!(file, "        \"\"\"");
+                write_str!(
+                    file,
+                    "        :raises InvalidFlatbuffer: If the `data` is invalid for this type"
+                );
+                write_str!(file, "        \"\"\"");
             }
         }
 
         write_str!(file, "    def __str__(self) -> str: ...");
         write_str!(file, "    def __repr__(self) -> str: ...");
-
-        if !(matches!(item, PythonBindType::Union { .. })) {
-            write_str!(file, "    def pack(self) -> bytes: ...");
-            write_str!(file, "    @staticmethod");
-            write_fmt!(file, "    def unpack(data: bytes) -> {type_name}:");
-            write_str!(file, "        \"\"\"");
-            write_str!(
-                file,
-                "        :raises InvalidFlatbuffer: If the `data` is invalid for this type"
-            );
-            write_str!(file, "        \"\"\"");
-        }
-
         write_str!(file, "");
     }