From 9db4c1a4a5e469ed87817087aee27c3591d1d19e Mon Sep 17 00:00:00 2001 From: Mingwei Samuel Date: Wed, 30 Oct 2019 13:29:23 -0700 Subject: [PATCH] making some enums #[non_exhaustive] --- src/consts/champion.rs | 5 +++++ src/consts/game_mode.rs | 1 + src/consts/map.rs | 1 + src/consts/queue.rs | 1 + src/consts/queue_type.rs | 1 + src/consts/season.rs | 1 + src/endpoints.rs | 2 +- srcgen/consts/champion.rs.dt | 1 + srcgen/consts/game_mode.rs.dt | 1 + srcgen/consts/map.rs.dt | 1 + srcgen/consts/queue.rs.dt | 1 + srcgen/consts/season.rs.dt | 1 + 12 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/consts/champion.rs b/src/consts/champion.rs index 81bc755..f6f236d 100644 --- a/src/consts/champion.rs +++ b/src/consts/champion.rs @@ -14,6 +14,7 @@ use serde_repr::{ Serialize_repr, Deserialize_repr }; /// /// The documentation of each variant specifies:
/// NAME (`IDENTIFIER`, ID). +#[non_exhaustive] #[derive(Debug, Copy, Clone)] #[derive(IntoPrimitive, TryFromPrimitive)] #[derive(Serialize_repr, Deserialize_repr)] @@ -120,6 +121,7 @@ pub enum Champion { /** Rumble (`Rumble`, 68). */ Rumble = 68, /** Ryze (`Ryze`, 13). */ Ryze = 13, /** Sejuani (`Sejuani`, 113). */ Sejuani = 113, + /** Senna (`Senna`, 235). */ Senna = 235, /** Shaco (`Shaco`, 35). */ Shaco = 35, /** Shen (`Shen`, 98). */ Shen = 98, /** Shyvana (`Shyvana`, 102). */ Shyvana = 102, @@ -271,6 +273,7 @@ impl Champion { Self::Rumble => "Rumble", Self::Ryze => "Ryze", Self::Sejuani => "Sejuani", + Self::Senna => "Senna", Self::Shaco => "Shaco", Self::Shen => "Shen", Self::Shyvana => "Shyvana", @@ -422,6 +425,7 @@ impl Champion { Self::Rumble => "Rumble", Self::Ryze => "Ryze", Self::Sejuani => "Sejuani", + Self::Senna => "Senna", Self::Shaco => "Shaco", Self::Shen => "Shen", Self::Shyvana => "Shyvana", @@ -589,6 +593,7 @@ impl std::str::FromStr for Champion { 1381322050 /* RUMB */ => Ok(Self::Rumble), 1381587525 /* RYZE */ => Ok(Self::Ryze), 1397049941 /* SEJU */ => Ok(Self::Sejuani), + 1397050958 /* SENN */ => Ok(Self::Senna), 1397244227 /* SHAC */ => Ok(Self::Shaco), 1397245262 /* SHEN */ => Ok(Self::Shen), 1397250390 /* SHYV */ => Ok(Self::Shyvana), diff --git a/src/consts/game_mode.rs b/src/consts/game_mode.rs index 16c2dd3..84d714c 100644 --- a/src/consts/game_mode.rs +++ b/src/consts/game_mode.rs @@ -10,6 +10,7 @@ use strum_macros::{ EnumString, Display, AsRefStr }; /// League of Legends game mode, such as Classic, /// ARAM, URF, One For All, Ascension, etc. +#[non_exhaustive] #[derive(Debug, Copy, Clone)] #[derive(Eq, PartialEq, Hash)] #[derive(EnumString, Display, AsRefStr)] diff --git a/src/consts/map.rs b/src/consts/map.rs index c03ca3a..624c235 100644 --- a/src/consts/map.rs +++ b/src/consts/map.rs @@ -10,6 +10,7 @@ use serde_repr::{ Serialize_repr, Deserialize_repr }; use num_enum::{ IntoPrimitive, TryFromPrimitive }; /// League of Legends maps. +#[non_exhaustive] #[derive(Debug, Copy, Clone)] #[derive(Eq, PartialEq, Hash, PartialOrd, Ord)] #[derive(Serialize_repr, Deserialize_repr)] diff --git a/src/consts/queue.rs b/src/consts/queue.rs index 8ba6b34..78e3495 100644 --- a/src/consts/queue.rs +++ b/src/consts/queue.rs @@ -10,6 +10,7 @@ use serde_repr::{ Serialize_repr, Deserialize_repr }; use num_enum::{ IntoPrimitive, TryFromPrimitive }; /// League of Legends matchmaking queue. +#[non_exhaustive] #[derive(Debug, Copy, Clone)] #[derive(Eq, PartialEq)] #[derive(Serialize_repr, Deserialize_repr)] diff --git a/src/consts/queue_type.rs b/src/consts/queue_type.rs index ff9cb5a..e43fb6e 100644 --- a/src/consts/queue_type.rs +++ b/src/consts/queue_type.rs @@ -1,6 +1,7 @@ use strum_macros::{ EnumString, Display, AsRefStr }; /// LoL or TFT ranked queue types. +#[non_exhaustive] #[derive(Debug, Copy, Clone)] #[derive(Eq, PartialEq, Hash)] #[derive(EnumString, Display, AsRefStr)] diff --git a/src/consts/season.rs b/src/consts/season.rs index c4fde90..086bd0f 100644 --- a/src/consts/season.rs +++ b/src/consts/season.rs @@ -10,6 +10,7 @@ use serde_repr::{ Serialize_repr, Deserialize_repr }; use num_enum::{ IntoPrimitive, TryFromPrimitive }; /// League of Legends matchmaking seasons. +#[non_exhaustive] #[derive(Debug, Copy, Clone)] #[derive(Eq, PartialEq, Hash, PartialOrd, Ord)] #[derive(Serialize_repr, Deserialize_repr)] diff --git a/src/endpoints.rs b/src/endpoints.rs index 4f897fc..9b318ca 100644 --- a/src/endpoints.rs +++ b/src/endpoints.rs @@ -7,7 +7,7 @@ /////////////////////////////////////////////// // http://www.mingweisamuel.com/riotapi-schema/tool/ -// Version 85da12632b552f2033d1708c17b04306e90b935e +// Version 6699beea97d4afea8ffa9310a554ec23a499e531 //! Automatically generated endpoint handles and data transfer structs. diff --git a/srcgen/consts/champion.rs.dt b/srcgen/consts/champion.rs.dt index 452076d..e8a5ab9 100644 --- a/srcgen/consts/champion.rs.dt +++ b/srcgen/consts/champion.rs.dt @@ -21,6 +21,7 @@ use serde_repr::{ Serialize_repr, Deserialize_repr }; /// /// The documentation of each variant specifies:
/// NAME (`IDENTIFIER`, ID). +#[non_exhaustive] #[derive(Debug, Copy, Clone)] #[derive(IntoPrimitive, TryFromPrimitive)] #[derive(Serialize_repr, Deserialize_repr)] diff --git a/srcgen/consts/game_mode.rs.dt b/srcgen/consts/game_mode.rs.dt index 508baa8..c5725c3 100644 --- a/srcgen/consts/game_mode.rs.dt +++ b/srcgen/consts/game_mode.rs.dt @@ -7,6 +7,7 @@ use strum_macros::{ EnumString, Display, AsRefStr }; /// League of Legends game mode, such as Classic, /// ARAM, URF, One For All, Ascension, etc. +#[non_exhaustive] #[derive(Debug, Copy, Clone)] #[derive(Eq, PartialEq, Hash)] #[derive(EnumString, Display, AsRefStr)] diff --git a/srcgen/consts/map.rs.dt b/srcgen/consts/map.rs.dt index f301fb0..f1d6a53 100644 --- a/srcgen/consts/map.rs.dt +++ b/srcgen/consts/map.rs.dt @@ -9,6 +9,7 @@ use serde_repr::{ Serialize_repr, Deserialize_repr }; use num_enum::{ IntoPrimitive, TryFromPrimitive }; /// League of Legends maps. +#[non_exhaustive] #[derive(Debug, Copy, Clone)] #[derive(Eq, PartialEq, Hash, PartialOrd, Ord)] #[derive(Serialize_repr, Deserialize_repr)] diff --git a/srcgen/consts/queue.rs.dt b/srcgen/consts/queue.rs.dt index 798d425..c152344 100644 --- a/srcgen/consts/queue.rs.dt +++ b/srcgen/consts/queue.rs.dt @@ -13,6 +13,7 @@ use serde_repr::{ Serialize_repr, Deserialize_repr }; use num_enum::{ IntoPrimitive, TryFromPrimitive }; /// League of Legends matchmaking queue. +#[non_exhaustive] #[derive(Debug, Copy, Clone)] #[derive(Eq, PartialEq)] #[derive(Serialize_repr, Deserialize_repr)] diff --git a/srcgen/consts/season.rs.dt b/srcgen/consts/season.rs.dt index be726b2..aca5137 100644 --- a/srcgen/consts/season.rs.dt +++ b/srcgen/consts/season.rs.dt @@ -7,6 +7,7 @@ use serde_repr::{ Serialize_repr, Deserialize_repr }; use num_enum::{ IntoPrimitive, TryFromPrimitive }; /// League of Legends matchmaking seasons. +#[non_exhaustive] #[derive(Debug, Copy, Clone)] #[derive(Eq, PartialEq, Hash, PartialOrd, Ord)] #[derive(Serialize_repr, Deserialize_repr)]