Standardize usage of serde derives somewhat.

Author: daboross

Diff for: Cargo.toml

@@ -34,8 +34,7 @@ appveyor = { service = "github", repository = "daboross/rust-screeps-api", branc
 # Logging
 log = "0.4"
 # Parsing
-serde = "1.0"
-serde_derive = "1.0"
+serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 serde_ignored = "0.1"
 serde-tuple-vec-map = "1.0"

Diff for: src/data/errors.rs

@@ -2,7 +2,7 @@
 use crate::error;
 
 /// JSON API error result from the server.
-#[derive(serde_derive::Deserialize, Clone, Eq, PartialEq, Hash, Debug)]
+#[derive(serde::Deserialize, Clone, Eq, PartialEq, Hash, Debug)]
 pub struct ApiError {
     /// The error string.
     pub error: String,

Diff for: src/data/room_name.rs

@@ -2,6 +2,8 @@
 use std::borrow::Cow;
 use std::{error, fmt, ops};
 
+use serde::{Deserialize, Serialize};
+
 /// A structure representing a room name.
 #[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]
 pub struct RoomName {
@@ -249,7 +251,7 @@ impl<'a> fmt::Display for RoomNameParseError<'a> {
     }
 }
 
-mod serde {
+mod _serde {
     use super::{parse_or_cheap_failure, RoomName};
 
     use std::fmt;

Diff for: src/data/rooms.rs

@@ -1,4 +1,6 @@
 //! Room result structures.
+use serde::{Deserialize, Serialize};
+
 use crate::{decoders::timespec_seconds, error};
 
 /// A room state, returned by room status.

Diff for: src/data/users.rs

@@ -1,4 +1,5 @@
 //! User-related shared data structures.
+use serde::{Deserialize, Serialize};
 
 /// Badge type - what shape a badge should be.
 #[derive(Serialize, Deserialize, Clone, Eq, PartialEq, Hash, Debug)]

Diff for: src/endpoints/leaderboard/find_rank.rs

@@ -1,11 +1,12 @@
 //! Interpreting the result of finding the rank of a specific user.
+use serde::{Deserialize, Serialize};
 
 use crate::data;
 use crate::error::{ApiError, Result};
 use crate::EndpointResult;
 
 /// Raw result for when the API endpoint is called with a specific season id.
-#[derive(serde_derive::Deserialize, Clone, Hash, Debug)]
+#[derive(serde::Deserialize, Clone, Hash, Debug)]
 #[doc(hidden)]
 pub(crate) struct SingleResponse {
     // I have no idea what this is for, so not including in the documented and expected response.
@@ -18,14 +19,14 @@ pub(crate) struct SingleResponse {
 }
 
 /// Raw result for when the API endpoint is called without a specific season id.
-#[derive(serde_derive::Deserialize, Clone, Hash, Debug)]
+#[derive(serde::Deserialize, Clone, Hash, Debug)]
 #[doc(hidden)]
 pub(crate) struct AllSeasonRanksResponse {
     ok: i32,
     list: Vec<InnerAllSeasonsResponse>,
 }
 
-#[derive(serde_derive::Deserialize, Clone, Hash, Debug)]
+#[derive(serde::Deserialize, Clone, Hash, Debug)]
 struct InnerAllSeasonsResponse {
     // Again, no idea what this is for, so I'm not including it in the documented response.
     // _id: String,

Diff for: src/endpoints/leaderboard/page.rs

@@ -1,13 +1,15 @@
 //! Interpreting user leaderboard page results.
 use std::collections::HashMap;
 
+use serde::{Deserialize, Serialize};
+
 use super::find_rank;
 use crate::data;
 use crate::error::{ApiError, Result};
 use crate::EndpointResult;
 
 /// Raw list results.
-#[derive(serde_derive::Deserialize, Clone, Debug)]
+#[derive(Deserialize, Clone, Debug)]
 #[doc(hidden)]
 pub(crate) struct Response {
     ok: i32,
@@ -16,7 +18,7 @@ pub(crate) struct Response {
     users: HashMap<String, ExtendedUserInfo>,
 }
 
-#[derive(serde_derive::Deserialize, Clone, Hash, Debug)]
+#[derive(Deserialize, Clone, Hash, Debug)]
 struct ResponseRankedUser {
     //_id: String, // exists, but I don't know what it's for.
     rank: u32,
@@ -25,7 +27,7 @@ struct ResponseRankedUser {
     user: String,
 }
 
-#[derive(serde_derive::Deserialize, Clone, Hash, Debug)]
+#[derive(Deserialize, Clone, Hash, Debug)]
 struct ExtendedUserInfo {
     _id: String,
     username: String,

Diff for: src/endpoints/leaderboard/season_list.rs

@@ -1,18 +1,19 @@
 //! Interpreting leaderboard season list results.
+use serde::{Deserialize, Serialize};
 
 use crate::data;
 use crate::error::{ApiError, Result};
 use crate::EndpointResult;
 
 /// Call raw result.
-#[derive(serde_derive::Deserialize, Clone, Hash, Debug)]
+#[derive(Deserialize, Clone, Hash, Debug)]
 #[doc(hidden)]
 pub(crate) struct Response {
     ok: i32,
     seasons: Vec<Season>,
 }
 
-#[derive(serde_derive::Deserialize, Clone, Hash, Debug)]
+#[derive(Deserialize, Clone, Hash, Debug)]
 struct Season {
     _id: String,
     name: String,

Diff for: src/endpoints/login.rs

@@ -1,6 +1,8 @@
 //! Interpreting login responses.
 use std::borrow::Cow;
 
+use serde::{Deserialize, Serialize};
+
 use crate::data;
 use crate::error::{ApiError, Result};
 
@@ -30,7 +32,7 @@ impl<'a> LoginArgs<'a> {
 }
 
 /// Login raw result.
-#[derive(serde_derive::Deserialize, Clone, Hash, Debug)]
+#[derive(Deserialize, Clone, Hash, Debug)]
 pub(crate) struct Response {
     ok: i32,
     token: Option<String>,

Diff for: src/endpoints/map_stats.rs

@@ -3,7 +3,7 @@
 //! Note: currently only supports "owner0" stats, not any other statistic that can also be retrieved with the same API.
 use std::convert::AsRef;
 
-use serde::{Serialize, Serializer};
+use serde::{Deserialize, Serialize, Serializer};
 
 use crate::data::{self, RoomName};
 use crate::decoders::optional_timespec_seconds;
@@ -88,7 +88,7 @@ where
 }
 
 /// Map stats raw result.
-#[derive(serde_derive::Deserialize, Clone, Hash, Debug)]
+#[derive(Deserialize, Clone, Hash, Debug)]
 #[doc(hidden)]
 pub(crate) struct Response {
     ok: i32,
@@ -98,7 +98,7 @@ pub(crate) struct Response {
     users: Vec<(String, UserResponse)>,
 }
 
-#[derive(serde_derive::Deserialize, Clone, Hash, Debug)]
+#[derive(Deserialize, Clone, Hash, Debug)]
 #[serde(rename_all = "camelCase")]
 struct RoomResponse {
     status: String,
@@ -115,7 +115,7 @@ struct RoomResponse {
     hard_sign: Option<data::HardSign>,
 }
 
-#[derive(serde_derive::Deserialize, Clone, Hash, Debug)]
+#[derive(Deserialize, Clone, Hash, Debug)]
 struct UserResponse {
     badge: data::Badge,
     _id: String,

Diff for: src/endpoints/memory_segment.rs

@@ -1,12 +1,14 @@
 //! Interpreting memory calls.
+use serde::Deserialize;
+
 use crate::{
     data,
     error::{ApiError, Result},
     EndpointResult,
 };
 
 /// Call raw result.
-#[derive(serde_derive::Deserialize, Clone, Hash, Debug)]
+#[derive(Deserialize, Clone, Hash, Debug)]
 #[doc(hidden)]
 pub(crate) struct Response {
     ok: i32,

Diff for: src/endpoints/my_info.rs

@@ -1,6 +1,7 @@
 //! Interpreting user self information.
 use std::collections::HashMap;
 
+use serde::{Deserialize, Serialize};
 use time::Timespec;
 
 use crate::{
@@ -11,7 +12,7 @@ use crate::{
 };
 
 /// User info raw result.
-#[derive(serde_derive::Deserialize, Clone, Debug)]
+#[derive(serde::Deserialize, Clone, Debug)]
 #[serde(rename_all = "camelCase")]
 pub(crate) struct Response {
     ok: i32,

Diff for: src/endpoints/recent_pvp.rs

@@ -1,4 +1,5 @@
 //! Interpreting rooms in which PvP recently occurred. This is an "experimental" endpoint.
+use serde::Deserialize;
 
 use crate::{
     data,
@@ -33,20 +34,20 @@ impl RecentPvpArgs {
 }
 
 /// Recent PvP raw result.
-#[derive(serde_derive::Deserialize, Clone, Hash, Debug)]
+#[derive(Deserialize, Clone, Hash, Debug)]
 pub(crate) struct Response {
     ok: i32,
     #[serde(with = "::tuple_vec_map")]
     pvp: Vec<(String, InnerShard)>,
 }
 
-#[derive(serde_derive::Deserialize, Clone, Hash, Debug)]
+#[derive(Deserialize, Clone, Hash, Debug)]
 struct InnerShard {
     rooms: Vec<InnerRoom>,
     time: u32,
 }
 
-#[derive(serde_derive::Deserialize, Clone, Hash, Debug)]
+#[derive(Deserialize, Clone, Hash, Debug)]
 struct InnerRoom {
     _id: String,
     #[serde(rename = "lastPvpTime")]

Diff for: src/endpoints/register.rs

@@ -1,6 +1,8 @@
 //! Creating registration calls and interpreting registration results.
 use std::borrow::Cow;
 
+use serde::{Deserialize, Serialize};
+
 use crate::{
     data,
     error::{ApiError, Result},
@@ -47,7 +49,7 @@ impl<'a> RegistrationArgs<'a> {
 }
 
 /// Raw registration response.
-#[derive(serde_derive::Deserialize, Clone, Hash, Debug)]
+#[derive(Deserialize, Clone, Hash, Debug)]
 pub(crate) struct Response {
     ok: i32,
 }

Diff for: src/endpoints/room_overview.rs

@@ -1,4 +1,5 @@
 //! Interpreting room overview results.
+use serde::{Deserialize, Serialize};
 
 use crate::{
     data::{self, Badge},
@@ -7,7 +8,7 @@ use crate::{
 };
 
 /// Room overview raw result.
-#[derive(serde_derive::Deserialize, Clone, Hash, Debug)]
+#[derive(serde::Deserialize, Clone, Hash, Debug)]
 #[serde(rename_all = "camelCase")]
 pub(crate) struct Response {
     ok: i32,
@@ -16,13 +17,13 @@ pub(crate) struct Response {
     stats_max: Option<RoomTotalStatsResponse>,
 }
 
-#[derive(serde_derive::Deserialize, Clone, Hash, Debug)]
+#[derive(serde::Deserialize, Clone, Hash, Debug)]
 struct OwnerResponse {
     username: String,
     badge: Badge,
 }
 
-#[derive(serde_derive::Deserialize, Clone, Hash, Debug)]
+#[derive(serde::Deserialize, Clone, Hash, Debug)]
 #[serde(rename_all = "camelCase")]
 struct RoomStatsResponse {
     energy_harvested: Vec<StatPointResponse>,
@@ -33,14 +34,14 @@ struct RoomStatsResponse {
     creeps_lost: Vec<StatPointResponse>,
 }
 
-#[derive(serde_derive::Deserialize, Copy, Clone, Hash, Debug)]
+#[derive(serde::Deserialize, Copy, Clone, Hash, Debug)]
 #[serde(rename_all = "camelCase")]
 struct StatPointResponse {
     value: u32,
     end_time: u32,
 }
 
-#[derive(serde_derive::Deserialize, Copy, Clone, Hash, Debug)]
+#[derive(serde::Deserialize, Copy, Clone, Hash, Debug)]
 #[serde(rename_all = "camelCase")]
 struct RoomTotalStatsResponse {
     energy_8: u32,

Diff for: src/endpoints/room_status.rs

@@ -1,4 +1,5 @@
 //! Interpreting room status results.
+use serde::{Deserialize, Serialize};
 
 use crate::{
     data::{self, RoomName, RoomState},
@@ -8,13 +9,13 @@ use crate::{
 };
 
 /// Room overview raw result.
-#[derive(serde_derive::Deserialize, Clone, Hash, Debug)]
+#[derive(serde::Deserialize, Clone, Hash, Debug)]
 pub(crate) struct Response {
     ok: i32,
     room: Option<InnerRoom>,
 }
 
-#[derive(serde_derive::Deserialize, Clone, Hash, Debug)]
+#[derive(serde::Deserialize, Clone, Hash, Debug)]
 struct InnerRoom {
     /// The room's name
     _id: String,

Diff for: src/endpoints/room_terrain.rs

@@ -1,6 +1,6 @@
 //! Interpreting room terrain results.
-
 use arrayvec::ArrayVec;
+use serde::{Deserialize, Serialize};
 
 use crate::{
     data,
@@ -9,13 +9,13 @@ use crate::{
 };
 
 /// Room overview raw result.
-#[derive(serde_derive::Deserialize, Clone, Hash, Debug)]
+#[derive(serde::Deserialize, Clone, Hash, Debug)]
 pub(crate) struct Response {
     ok: i32,
     terrain: Option<Vec<InnerResponse>>,
 }
 
-#[derive(serde_derive::Deserialize, Clone, Hash, Debug)]
+#[derive(serde::Deserialize, Clone, Hash, Debug)]
 struct InnerResponse {
     // this is returned as part of the data, but what the heck is it even for?
     /// A cache key maybe?

Diff for: src/endpoints/set_memory_segment.rs

@@ -1,14 +1,16 @@
 //! Interpreting memory calls.
 use std::borrow::Cow;
 
+use serde::Serialize;
+
 use crate::{
     data,
     error::{ApiError, Result},
     EndpointResult,
 };
 
 /// Call raw result.
-#[derive(serde_derive::Deserialize, Clone, Hash, Debug)]
+#[derive(serde::Deserialize, Clone, Hash, Debug)]
 #[doc(hidden)]
 pub(crate) struct Response {
     ok: i32,