Unify derived traits

Author: antaljanosbenjamin

cminesweeper/src/lib.rs

@@ -7,7 +7,7 @@ use std::slice;
 use strum_macros::Display;
 
 #[repr(C)]
-#[derive(Eq, PartialEq, Display, Debug)]
+#[derive(Clone, Copy, Eq, PartialEq, Display, Debug)]
 pub enum CError {
     Ok,
     InvalidInput,
@@ -162,13 +162,15 @@ fn open_common(
 
 // Based on this https://s3.amazonaws.com/temp.michaelfbryan.com/objects/index.html
 #[repr(C)]
+#[derive(Clone, Eq, PartialEq, Debug)]
 pub struct COpenedField {
     row: GameSizeType,
     column: GameSizeType,
     field_type: FieldType,
 }
 
 #[repr(C)]
+#[derive(Clone, Eq, PartialEq, Debug)]
 pub struct COpenInfo {
     result: OpenResult,
     newly_opened_fields_length: ArraySizeType,
@@ -177,6 +179,7 @@ pub struct COpenInfo {
 }
 
 #[repr(C)]
+#[derive(Clone, Eq, PartialEq, Debug)]
 pub struct CErrorInfo {
     error_code: CError,
     error_message_length: ArraySizeType,

minesweeper/Cargo.toml

@@ -9,7 +9,7 @@ edition = "2018"
 [dependencies]
 rand = "0.7.2"
 indexmap = "1.0.2"
-hrsw = "0.1.0"
+hrsw = "0.1.2"
 strum = "0.18.0"
 strum_macros = "0.18.0"
 lazy_static = "1.4.0"

minesweeper/src/minesweeper_logic/field_info.rs

@@ -1,5 +1,6 @@
 use strum_macros::Display;
 
+#[repr(C)]
 #[derive(Clone, Copy, Eq, PartialEq, Display, Debug)]
 pub enum FieldState {
     Closed,
@@ -18,7 +19,7 @@ impl FieldState {
 }
 
 #[repr(C)]
-#[derive(Clone, Eq, PartialEq, Display, Debug)]
+#[derive(Clone, Copy, Eq, PartialEq, Display, Debug)]
 pub enum FieldType {
     Empty,
     Numbered(u8),

minesweeper/src/minesweeper_logic/game.rs

@@ -10,14 +10,14 @@ static GAME_IS_ALREADY_STOPPED_ERROR: &'static str = "Game is already stopped!";
 
 #[repr(C)]
 #[allow(dead_code)]
-#[derive(Eq, PartialEq, Display, Debug)]
+#[derive(Clone, Copy, Eq, PartialEq, Display, Debug)]
 pub enum GameLevel {
     Beginner,
     Intermediate,
     Expert,
 }
 
-#[derive(Eq, PartialEq, Display, Debug)]
+#[derive(Clone, Copy, Eq, PartialEq, Display, Debug)]
 enum GameState {
     NotStarted,
     Started,

minesweeper/src/minesweeper_logic/results.rs

@@ -4,23 +4,23 @@ use std::collections::HashMap;
 use strum_macros::Display;
 
 #[repr(C)]
-#[derive(Eq, PartialEq, Display, Debug)]
+#[derive(Clone, Copy, Eq, PartialEq, Display, Debug)]
 pub enum FlagResult {
     Flagged,
     FlagRemoved,
     AlreadyOpened,
 }
 
 #[repr(C)]
-#[derive(Eq, PartialEq, Display, Debug)]
+#[derive(Clone, Copy, Eq, PartialEq, Display, Debug)]
 pub enum OpenResult {
     Ok,
     IsFlagged,
     Boom,
     WINNER,
 }
 
-#[derive(Eq, PartialEq, Debug)]
+#[derive(Clone, Eq, PartialEq, Debug)]
 pub struct OpenInfo {
     pub result: OpenResult,
     pub newly_opened_fields: HashMap<(SizeType, SizeType), FieldType>,

minesweeper/src/minesweeper_logic/table.rs

@@ -31,7 +31,7 @@ pub trait Table {
     fn toggle_flag(&mut self, row: SizeType, col: SizeType) -> Result<FlagResult, &'static str>;
 }
 
-#[derive(Eq, PartialEq, Display, Debug)]
+#[derive(Clone, Copy, Eq, PartialEq, Display, Debug)]
 enum FieldOpenResult {
     AlreadyOpened,
     SimpleOpen,
@@ -40,7 +40,7 @@ enum FieldOpenResult {
     IsFlagged,
 }
 
-#[derive(Debug, Eq, PartialEq)]
+#[derive(Clone, Eq, PartialEq, Debug)]
 struct FieldInner {
     field_info: FieldInfo,
 }
@@ -158,6 +158,7 @@ impl Field for FieldInner {
     }
 }
 
+#[derive(Clone, Eq, PartialEq, Debug)]
 struct FieldVisiter {
     height: SizeType,
     width: SizeType,
@@ -335,7 +336,7 @@ fn generate_fields(
     Ok(fields)
 }
 
-#[derive(Debug, Eq, PartialEq)]
+#[derive(Clone, Eq, PartialEq, Debug)]
 pub struct BasicTable {
     height: SizeType,
     width: SizeType,