adding/switching to num_enum macros for enums

Cargo.toml

@@ -12,8 +12,7 @@ include = [ "src/**/*" ]
 
 [dependencies]
 log = "0.4"
-num-traits = "0.2"
+num_enum = "0.4"
-num-derive = "0.3"
 parking_lot = { version = "0.9", features = [ "nightly" ] }
 reqwest = { version = "0.10.0-alpha.1", features = [ "gzip", "json" ] }
 scan_fmt = "0.2"

src/consts/champion.rs

@@ -7,7 +7,7 @@
 ///////////////////////////////////////////////
 
 use std::fmt;
-use num_derive::{ FromPrimitive, ToPrimitive };
+use num_enum::{ IntoPrimitive, TryFromPrimitive };
 use serde_repr::{ Serialize_repr, Deserialize_repr };
 
 /// League of Legend's champions.
@@ -15,7 +15,7 @@ use serde_repr::{ Serialize_repr, Deserialize_repr };
 /// The documentation of each variant specifies:<br>
 /// NAME (`IDENTIFIER`, ID).
 #[derive(Debug, Copy, Clone)]
-#[derive(FromPrimitive, ToPrimitive)]
+#[derive(IntoPrimitive, TryFromPrimitive)]
 #[derive(Serialize_repr, Deserialize_repr)]
 #[repr(i16)]
 pub enum Champion {

src/consts/division.rs

@@ -2,11 +2,13 @@
 
 use strum_macros::{ EnumString, Display, AsRefStr };
 use serde_repr::{ Serialize_repr, Deserialize_repr };
+use num_enum::{ IntoPrimitive, TryFromPrimitive };
 
 #[derive(Debug, Copy, Clone)]
 #[derive(Eq, PartialEq, Hash, PartialOrd, Ord)]
 #[derive(EnumString, Display, AsRefStr)]
 #[derive(Serialize_repr, Deserialize_repr)]
+#[derive(IntoPrimitive, TryFromPrimitive)]
 #[repr(u8)]
 pub enum Division {
     I   = 1,

src/consts/map.rs

@@ -7,11 +7,13 @@
 ///////////////////////////////////////////////
 
 use serde_repr::{ Serialize_repr, Deserialize_repr };
+use num_enum::{ IntoPrimitive, TryFromPrimitive };
 
 /// League of Legends maps.
 #[derive(Debug, Copy, Clone)]
 #[derive(Eq, PartialEq, Hash, PartialOrd, Ord)]
 #[derive(Serialize_repr, Deserialize_repr)]
+#[derive(IntoPrimitive, TryFromPrimitive)]
 #[repr(u8)]
 pub enum Map {
 

src/consts/queue.rs

@@ -8,11 +8,13 @@
 #![allow(deprecated)]
 
 use serde_repr::{ Serialize_repr, Deserialize_repr };
+use num_enum::{ IntoPrimitive, TryFromPrimitive };
 
 /// League of Legends matchmaking queue.
 #[derive(Debug, Copy, Clone)]
 #[derive(Eq, PartialEq)]
 #[derive(Serialize_repr, Deserialize_repr)]
+#[derive(IntoPrimitive, TryFromPrimitive)]
 #[repr(u16)]
 pub enum Queue {
 

src/consts/season.rs

@@ -7,11 +7,13 @@
 ///////////////////////////////////////////////
 
 use serde_repr::{ Serialize_repr, Deserialize_repr };
+use num_enum::{ IntoPrimitive, TryFromPrimitive };
 
 /// League of Legends matchmaking seasons.
 #[derive(Debug, Copy, Clone)]
 #[derive(Eq, PartialEq, Hash, PartialOrd, Ord)]
 #[derive(Serialize_repr, Deserialize_repr)]
+#[derive(IntoPrimitive, TryFromPrimitive)]
 #[repr(u8)]
 pub enum Season {
     Preseason3    = 0,

src/consts/team.rs

@@ -1,9 +1,11 @@
 use serde_repr::{ Serialize_repr, Deserialize_repr };
+use num_enum::{ IntoPrimitive, TryFromPrimitive };
 
 /// League of Legends team.
 #[derive(Debug, Copy, Clone)]
 #[derive(Eq, PartialEq, Hash, Ord, PartialOrd)]
 #[derive(Serialize_repr, Deserialize_repr)]
+#[derive(IntoPrimitive, TryFromPrimitive)]
 #[repr(u8)]
 pub enum Team {
     /// Blue team (bottom left on Summoner's Rift).

src/consts/tier.rs

@@ -1,10 +1,12 @@
 #![allow(deprecated)]
 
 use strum_macros::{ EnumString, Display, AsRefStr };
+use num_enum::{ IntoPrimitive, TryFromPrimitive };
 
 #[derive(Debug, Copy, Clone)]
 #[derive(Eq, PartialEq, Hash, PartialOrd, Ord)]
 #[derive(EnumString, Display, AsRefStr)]
+#[derive(IntoPrimitive, TryFromPrimitive)]
 #[repr(u8)]
 pub enum Tier {
     #[strum(to_string="IRON")]        Iron        =  40,
@@ -13,9 +15,9 @@ pub enum Tier {
     #[strum(to_string="GOLD")]        Gold        = 100,
     #[strum(to_string="PLATINUM")]    Platinum    = 120,
     #[strum(to_string="DIAMOND")]     Diamond     = 140,
-    #[strum(to_string="MASTER")]      Master      = 200,
+    #[strum(to_string="MASTER")]      Master      = 180,
-    #[strum(to_string="GRANDMASTER")] Grandmaster = 220,
+    #[strum(to_string="GRANDMASTER")] Grandmaster = 200,
-    #[strum(to_string="CHALLENGER")]  Challenger  = 240,
+    #[strum(to_string="CHALLENGER")]  Challenger  = 220,
 }
 
 serde_string!(Tier);

srcgen/consts/champion.rs.dt

@@ -14,7 +14,7 @@
 }}{{= require('./dotUtils.js').preamble() }}
 
 use std::fmt;
-use num_derive::{ FromPrimitive, ToPrimitive };
+use num_enum::{ IntoPrimitive, TryFromPrimitive };
 use serde_repr::{ Serialize_repr, Deserialize_repr };
 
 /// League of Legend's champions.
@@ -22,7 +22,7 @@ use serde_repr::{ Serialize_repr, Deserialize_repr };
 /// The documentation of each variant specifies:<br>
 /// NAME (`IDENTIFIER`, ID).
 #[derive(Debug, Copy, Clone)]
-#[derive(FromPrimitive, ToPrimitive)]
+#[derive(IntoPrimitive, TryFromPrimitive)]
 #[derive(Serialize_repr, Deserialize_repr)]
 #[repr(i16)]
 pub enum Champion {

srcgen/consts/map.rs.dt

@@ -6,11 +6,13 @@
 }}{{= dotUtils.preamble() }}
 
 use serde_repr::{ Serialize_repr, Deserialize_repr };
+use num_enum::{ IntoPrimitive, TryFromPrimitive };
 
 /// League of Legends maps.
 #[derive(Debug, Copy, Clone)]
 #[derive(Eq, PartialEq, Hash, PartialOrd, Ord)]
 #[derive(Serialize_repr, Deserialize_repr)]
+#[derive(IntoPrimitive, TryFromPrimitive)]
 #[repr(u8)]
 pub enum Map {
 {{

srcgen/consts/queue.rs.dt

@@ -11,11 +11,13 @@
 #![allow(deprecated)]
 
 use serde_repr::{ Serialize_repr, Deserialize_repr };
+use num_enum::{ IntoPrimitive, TryFromPrimitive };
 
 /// League of Legends matchmaking queue.
 #[derive(Debug, Copy, Clone)]
 #[derive(Eq, PartialEq)]
 #[derive(Serialize_repr, Deserialize_repr)]
+#[derive(IntoPrimitive, TryFromPrimitive)]
 #[repr(u16)]
 pub enum Queue {
 {{

srcgen/consts/season.rs.dt

@@ -4,11 +4,13 @@
 }}{{= dotUtils.preamble() }}
 
 use serde_repr::{ Serialize_repr, Deserialize_repr };
+use num_enum::{ IntoPrimitive, TryFromPrimitive };
 
 /// League of Legends matchmaking seasons.
 #[derive(Debug, Copy, Clone)]
 #[derive(Eq, PartialEq, Hash, PartialOrd, Ord)]
 #[derive(Serialize_repr, Deserialize_repr)]
+#[derive(IntoPrimitive, TryFromPrimitive)]
 #[repr(u8)]
 pub enum Season {
 {{