Convert Map from enum into newtype_enum

src/consts/macros.rs

@@ -64,7 +64,7 @@ macro_rules! newtype_enum {
     } => {
         $( #[$attr] )*
         #[derive(Copy, Clone)]
-        #[derive(PartialEq, Eq, PartialOrd, Ord)]
+        #[derive(Hash, PartialEq, Eq, PartialOrd, Ord)]
         #[repr(transparent)]
         $v struct $name($v $repr);
         impl $name {

src/consts/map.rs

@@ -6,17 +6,13 @@
 //                                           //
 ///////////////////////////////////////////////
 
-use serde_repr::{ Serialize_repr, Deserialize_repr };
-use num_enum::{ IntoPrimitive, TryFromPrimitive };
+use serde::{ Serialize, Deserialize };
 
-/// League of Legends maps.
-#[non_exhaustive]
-#[derive(Debug, Copy, Clone)]
-#[derive(Eq, PartialEq, Hash, PartialOrd, Ord)]
-#[derive(Serialize_repr, Deserialize_repr)]
-#[derive(IntoPrimitive, TryFromPrimitive)]
-#[repr(u8)]
-pub enum Map {
+newtype_enum! {
+    /// A League of Legends map.
+    #[derive(Serialize, Deserialize)]
+    #[serde(transparent)]
+    pub newtype_enum Map(u8) {
         /// Summoner's Rift
         /// Original Summer variant
         SUMMONERS_RIFT_ORIGINAL_SUMMER_VARIANT = 1,
@@ -63,3 +59,4 @@ pub enum Map {
         /// Teamfight Tactics map
         CONVERGENCE = 22,
     }
+}

srcgen/consts/map.rs.dt

@@ -3,17 +3,13 @@
     const maps = require('./.maps.json');
 }}{{= dotUtils.preamble() }}
 
-use serde_repr::{ Serialize_repr, Deserialize_repr };
-use num_enum::{ IntoPrimitive, TryFromPrimitive };
+use serde::{ Serialize, Deserialize };
 
-/// League of Legends maps.
-#[non_exhaustive]
-#[derive(Debug, Copy, Clone)]
-#[derive(Eq, PartialEq, Hash, PartialOrd, Ord)]
-#[derive(Serialize_repr, Deserialize_repr)]
-#[derive(IntoPrimitive, TryFromPrimitive)]
-#[repr(u8)]
-pub enum Map {
+newtype_enum! {
+    /// A League of Legends map.
+    #[derive(Serialize, Deserialize)]
+    #[serde(transparent)]
+    pub newtype_enum Map(u8) {
 {{
     for (const e of maps) {
         const desc = e['x-desc'] ? e['x-desc'].split('\n') : [];
@@ -26,3 +22,4 @@ pub enum Map {
     }
 }}
     }
+}