From 37c00067583f7d9a9c8ec447aa93cd7298551e0a Mon Sep 17 00:00:00 2001 From: TotallyNot <44345987+TotallyNot@users.noreply.github.com> Date: Mon, 19 Aug 2024 16:52:18 +0200 Subject: [PATCH] api enum derives --- torn-api/Cargo.toml | 2 +- torn-api/src/torn.rs | 6 +++--- torn-api/src/user.rs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/torn-api/Cargo.toml b/torn-api/Cargo.toml index 3a263a0..c69fbc3 100644 --- a/torn-api/Cargo.toml +++ b/torn-api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "torn-api" -version = "0.7.3" +version = "0.7.4" edition = "2021" rust-version = "1.75.0" authors = ["Pyrit [2111649]"] diff --git a/torn-api/src/torn.rs b/torn-api/src/torn.rs index 4398a7e..0d2ee4e 100644 --- a/torn-api/src/torn.rs +++ b/torn-api/src/torn.rs @@ -205,7 +205,7 @@ pub struct TerritoryWarReportWar { pub result: TerritoryWarOutcome, } -#[derive(Debug, Clone, PartialEq, Eq, Deserialize)] +#[derive(Debug, Clone, Copy, Deserialize, PartialEq, Eq, Hash)] #[serde(rename_all = "snake_case")] pub enum TerritoryWarReportRole { Aggressor, @@ -229,7 +229,7 @@ pub struct TerritoryWarReport { pub factions: HashMap, } -#[derive(Debug, Clone, Copy, PartialEq, Eq, Deserialize)] +#[derive(Debug, Clone, Copy, Deserialize, PartialEq, Eq, Hash)] #[non_exhaustive] pub enum ItemType { Primary, @@ -259,7 +259,7 @@ pub enum ItemType { Virus, } -#[derive(Debug, Clone, Copy, PartialEq, Eq, Deserialize)] +#[derive(Debug, Clone, Copy, Deserialize, PartialEq, Eq, Hash)] #[non_exhaustive] //Missing hand to hand because it is not possible as a weapon pub enum WeaponType { diff --git a/torn-api/src/user.rs b/torn-api/src/user.rs index 26e0872..7e7d812 100644 --- a/torn-api/src/user.rs +++ b/torn-api/src/user.rs @@ -41,7 +41,7 @@ pub enum UserSelection { pub type Selection = UserSelection; -#[derive(Debug, Clone, Copy, PartialEq, Eq, Deserialize)] +#[derive(Debug, Clone, Copy, Deserialize, PartialEq, Eq, Hash)] pub enum Gender { Male, Female, @@ -495,7 +495,7 @@ impl<'de> Deserialize<'de> for Icon { } } -#[derive(Debug, Clone, Copy, PartialEq, Eq, Deserialize)] +#[derive(Debug, Clone, Copy, Deserialize, PartialEq, Eq, Hash)] #[non_exhaustive] pub enum Job { Director,