Update types for ESI-given types

src/groups/alliance.rs

@@ -8,11 +8,11 @@ pub struct AllianceGroup<'a> {
 #[derive(Debug, Deserialize, Serialize, Clone)]
 #[allow(missing_docs)]
 pub struct AllianceInfo {
-    pub creator_corporation_id: u64,
-    pub creator_id: u64,
+    pub creator_corporation_id: i32,
+    pub creator_id: i32,
     pub date_founded: String,
-    pub executor_corporation_id: Option<u32>,
-    pub faction_id: Option<u32>,
+    pub executor_corporation_id: Option<i32>,
+    pub faction_id: Option<i32>,
     pub name: String,
     pub ticker: String,
 }
@@ -30,7 +30,7 @@ impl<'a> AllianceGroup<'a> {
         list_ids,
         "get_alliances",
         RequestType::Public,
-        Vec<u32>,
+        Vec<i32>,
     );
 
     api_get!(
@@ -39,16 +39,16 @@ impl<'a> AllianceGroup<'a> {
         "get_alliances_alliance_id",
         RequestType::Public,
         AllianceInfo,
-        (alliance_id: u64) => "{alliance_id}"
+        (alliance_id: i32) => "{alliance_id}"
     );
 
     api_get!(
         /// Get list of corporation IDs in an alliance.
         get_alliance_corporations,
         "get_alliances_alliance_id_corporations",
         RequestType::Public,
-        Vec<u32>,
-        (alliance_id: u64) => "{alliance_id}"
+        Vec<i32>,
+        (alliance_id: i32) => "{alliance_id}"
     );
 
     api_get!(
@@ -57,6 +57,6 @@ impl<'a> AllianceGroup<'a> {
         "get_alliances_alliance_id_icons",
         RequestType::Public,
         AllianceIcons,
-        (alliance_id: u64) => "{alliance_id}"
+        (alliance_id: i32) => "{alliance_id}"
     );
 }

src/groups/assets.rs

@@ -10,26 +10,26 @@ pub struct AssetsGroup<'a> {
 pub struct Asset {
     pub is_blueprint_copy: Option<bool>,
     pub is_singleton: bool,
-    pub item_id: u64,
+    pub item_id: i64,
     pub location_flag: String,
-    pub location_id: u64,
+    pub location_id: i64,
     pub location_type: String,
-    pub quantity: u64,
-    pub type_id: u64,
+    pub quantity: i32,
+    pub type_id: i32,
 }
 
 #[derive(Debug, Deserialize)]
 #[allow(missing_docs)]
 pub struct AssetLocationPosition {
-    pub x: u64,
-    pub y: u64,
-    pub z: u64,
+    pub x: f64,
+    pub y: f64,
+    pub z: f64,
 }
 
 #[derive(Debug, Deserialize)]
 #[allow(missing_docs)]
 pub struct AssetLocation {
-    pub item_id: u64,
+    pub item_id: i64,
     pub position: AssetLocationPosition,
 }
 
@@ -47,7 +47,7 @@ impl<'a> AssetsGroup<'a> {
         "get_characters_character_id_assets",
         RequestType::Authenticated,
         Vec<Asset>,
-        (character_id: u64) => "{character_id}"
+        (character_id: i32) => "{character_id}"
     );
 
     api_post!(
@@ -56,8 +56,8 @@ impl<'a> AssetsGroup<'a> {
         "post_characters_character_id_assets_locations",
         RequestType::Authenticated,
         Vec<AssetLocation>,
-        (character_id: u64) => "{character_id}",
-        item_ids: &[u64],
+        (character_id: i32) => "{character_id}",
+        item_ids: &[i64],
     );
 
     api_post!(
@@ -66,7 +66,7 @@ impl<'a> AssetsGroup<'a> {
         "post_characters_character_id_assets_names",
         RequestType::Authenticated,
         Vec<AssetName>,
-        (character_id: u64) => "{character_id}",
+        (character_id: i32) => "{character_id}",
         item_ids: &[u64],
     );
 

src/groups/character.rs

@@ -8,10 +8,10 @@ pub struct CharacterGroup<'a> {
 #[derive(Debug, Deserialize)]
 #[allow(missing_docs)]
 pub struct CharacterPublicInfo {
-    pub alliance_id: Option<u64>,
+    pub alliance_id: Option<i32>,
     pub birthday: String,
-    pub bloodline_id: u64,
-    pub corporation_id: u64,
+    pub bloodline_id: i32,
+    pub corporation_id: i32,
     pub description: Option<String>,
     pub gender: String,
     pub name: String,
@@ -23,9 +23,9 @@ pub struct CharacterPublicInfo {
 #[derive(Debug, Deserialize)]
 #[allow(missing_docs)]
 pub struct CharacterCorporationHistoryItem {
-    pub corporation_id: u64,
+    pub corporation_id: i32,
     pub is_deleted: Option<bool>,
-    pub record_id: u64,
+    pub record_id: i32,
     pub start_date: String,
 }
 
@@ -41,23 +41,23 @@ pub struct CharacterPortraitInfo {
 #[derive(Debug, Deserialize)]
 #[allow(missing_docs)]
 pub struct CharacterAffiliation {
-    pub alliance_id: Option<u64>,
-    pub character_id: u64,
-    pub corporation_id: u64,
-    pub faction_id: Option<u64>,
+    pub alliance_id: Option<i32>,
+    pub character_id: i32,
+    pub corporation_id: i32,
+    pub faction_id: Option<i32>,
 }
 
 #[derive(Debug, Deserialize)]
 #[allow(missing_docs)]
 pub struct Blueprint {
-    pub item_id: u64,
+    pub item_id: i64,
     pub location_flag: String,
-    pub location_id: u64,
-    pub material_efficiency: u8,
+    pub location_id: i64,
+    pub material_efficiency: i32,
     pub quantity: i32,
-    pub runs: i64,
-    pub time_efficiency: u8,
-    pub type_id: u64,
+    pub runs: i32,
+    pub time_efficiency: i32,
+    pub type_id: i32,
 }
 
 impl<'a> CharacterGroup<'a> {
@@ -67,7 +67,7 @@ impl<'a> CharacterGroup<'a> {
         "get_characters_character_id",
         RequestType::Public,
         CharacterPublicInfo,
-        (character_id: u64) => "{character_id}"
+        (character_id: i32) => "{character_id}"
     );
 
     api_get!(
@@ -76,7 +76,7 @@ impl<'a> CharacterGroup<'a> {
         "get_characters_character_id_corporationhistory",
         RequestType::Public,
         Vec<CharacterCorporationHistoryItem>,
-        (character_id: u64) => "{character_id}"
+        (character_id: i32) => "{character_id}"
     );
 
     api_get!(
@@ -85,7 +85,7 @@ impl<'a> CharacterGroup<'a> {
         "get_characters_character_id_portrait",
         RequestType::Public,
         CharacterPortraitInfo,
-        (character_id: u64) => "{character_id}"
+        (character_id: i32) => "{character_id}"
     );
 
     api_post!(
@@ -104,7 +104,7 @@ impl<'a> CharacterGroup<'a> {
         "get_characters_character_id_blueprints",
         RequestType::Authenticated,
         Vec<Blueprint>,
-        (character_id: u64) => "{character_id}"
+        (character_id: i32) => "{character_id}"
     );
 
     // more endpoints ...

src/groups/clones.rs

@@ -8,16 +8,16 @@ pub struct ClonesGroup<'a> {
 #[derive(Debug, Deserialize)]
 #[allow(missing_docs)]
 pub struct CloneHome {
-    pub location_id: Option<u64>,
+    pub location_id: Option<i64>,
     pub location_type: Option<String>,
 }
 
 #[derive(Debug, Deserialize)]
 #[allow(missing_docs)]
 pub struct JumpClone {
-    pub implants: Vec<u32>,
-    pub jump_clone_id: u32,
-    pub location_id: u64,
+    pub implants: Vec<i32>,
+    pub jump_clone_id: i32,
+    pub location_id: i64,
     pub location_type: String,
     pub name: Option<String>,
 }
@@ -37,7 +37,7 @@ impl<'a> ClonesGroup<'a> {
         "get_characters_character_id_clones",
         RequestType::Authenticated,
         Clones,
-        (character_id: u64) => "{character_id}"
+        (character_id: i32) => "{character_id}"
     );
 
     api_get!(
@@ -46,6 +46,6 @@ impl<'a> ClonesGroup<'a> {
         "get_characters_character_id_implants",
         RequestType::Authenticated,
         Vec<u32>,
-        (character_id: u64) => "{character_id}"
+        (character_id: i32) => "{character_id}"
     );
 }

src/groups/corporation.rs

@@ -3,17 +3,17 @@ use crate::prelude::*;
 #[derive(Debug, Deserialize, Serialize, Clone)]
 #[allow(missing_docs)]
 pub struct CorporationPublicInfo {
-    pub alliance_id: Option<u64>,
-    pub ceo_id: u64,
-    pub creator_id: u64,
+    pub alliance_id: Option<i32>,
+    pub ceo_id: i32,
+    pub creator_id: i32,
     pub date_founded: Option<String>,
     pub description: Option<String>,
-    pub faction_id: Option<u64>,
-    pub home_station_id: Option<u64>,
-    pub member_count: u64,
+    pub faction_id: Option<i32>,
+    pub home_station_id: Option<i32>,
+    pub member_count: i32,
     pub name: String,
     pub shares: Option<u64>,
-    pub tax_rate: f32,
+    pub tax_rate: f64,
     pub ticker: Option<String>,
     pub url: Option<String>,
     pub war_eligible: Option<bool>,
@@ -22,9 +22,9 @@ pub struct CorporationPublicInfo {
 #[derive(Debug, Deserialize)]
 #[allow(missing_docs)]
 pub struct CorporationHistoryItem {
-    pub alliance_id: Option<u64>,
+    pub alliance_id: Option<i32>,
     pub is_deleted: Option<bool>,
-    pub record_id: u64,
+    pub record_id: i32,
     pub start_date: String,
 }
 
@@ -40,7 +40,7 @@ impl<'a> CorporationGroup<'a> {
         "get_corporations_corporation_id",
         RequestType::Public,
         CorporationPublicInfo,
-        (corporation_id: u64) => "{corporation_id}"
+        (corporation_id: i32) => "{corporation_id}"
     );
 
     api_get!(
@@ -49,7 +49,7 @@ impl<'a> CorporationGroup<'a> {
         "get_corporations_corporation_id_alliancehistory",
         RequestType::Public,
         Vec<CorporationHistoryItem>,
-        (corporation_id: u64) => "{corporation_id}"
+        (corporation_id: i32) => "{corporation_id}"
     );
 
     api_get!(
@@ -60,7 +60,7 @@ impl<'a> CorporationGroup<'a> {
         "get_corporations_corporation_id_members",
         RequestType::Authenticated,
         Vec<u64>,
-        (corporation_id: u64) => "{corporation_id}"
+        (corporation_id: i32) => "{corporation_id}"
     );
 
     api_get!(

src/groups/faction_warfare.rs

@@ -8,8 +8,8 @@ pub struct FactionWarfareGroup<'a> {
 #[derive(Debug, Deserialize)]
 #[allow(missing_docs)]
 pub struct FactionLeaderboardItem {
-    pub amount: Option<u64>,
-    pub faction_id: Option<u64>,
+    pub amount: Option<i32>,
+    pub faction_id: Option<i32>,
 }
 
 #[derive(Debug, Deserialize)]
@@ -30,8 +30,8 @@ pub struct FWLeaderboards {
 #[derive(Debug, Deserialize)]
 #[allow(missing_docs)]
 pub struct CharacterLeaderboardItem {
-    pub amount: u64,
-    pub character_id: u64,
+    pub amount: i32,
+    pub character_id: i32,
 }
 
 #[derive(Debug, Deserialize)]
@@ -52,8 +52,8 @@ pub struct FWCharacterLeaderboards {
 #[derive(Debug, Deserialize)]
 #[allow(missing_docs)]
 pub struct CorporationLeaderboardItem {
-    pub amount: u64,
-    pub corporation_id: u64,
+    pub amount: i32,
+    pub corporation_id: i32,
 }
 
 #[derive(Debug, Deserialize)]
@@ -74,9 +74,9 @@ pub struct FWCorporationLeaderboards {
 #[derive(Debug, Deserialize)]
 #[allow(missing_docs)]
 pub struct FWStatsItemRange {
-    pub total: u32,
-    pub last_week: u32,
-    pub yesterday: u32,
+    pub total: i32,
+    pub last_week: i32,
+    pub yesterday: i32,
 }
 
 #[derive(Debug, Deserialize)]
@@ -103,8 +103,8 @@ pub struct FWSystem {
 #[derive(Debug, Deserialize)]
 #[allow(missing_docs)]
 pub struct FWWar {
-    pub faction_id: u32,
-    pub against_id: u32,
+    pub faction_id: i32,
+    pub against_id: i32,
 }
 
 impl<'a> FactionWarfareGroup<'a> {

src/groups/incursions.rs

@@ -8,12 +8,12 @@ pub struct IncursionsGroup<'a> {
 #[derive(Debug, Deserialize)]
 #[allow(missing_docs)]
 pub struct Incursion {
-    pub constellation_id: u64,
-    pub faction_id: u64,
+    pub constellation_id: i32,
+    pub faction_id: i32,
     pub has_boss: bool,
     pub infested_solar_systems: Vec<u32>,
     pub influence: f64,
-    pub staging_solar_system_id: u64,
+    pub staging_solar_system_id: i32,
     pub state: String,
     #[serde(rename = "type")]
     pub incursion_type: String,

src/groups/industry.rs

@@ -11,7 +11,7 @@ pub struct IndustryGroup<'a> {
 #[allow(missing_docs)]
 pub struct CostIndex {
     pub activity: String,
-    pub cost_index: f32,
+    pub cost_index: f64,
 }
 
 #[derive(Debug, Deserialize, Serialize, Clone)]