From aa22786d439814cc42ea5fa09dc01caf255ff3c2 Mon Sep 17 00:00:00 2001
From: gered <gered@blarg.ca>
Date: Tue, 28 Mar 2023 14:04:48 -0400
Subject: [PATCH] update dependencies

---
 ggdt/Cargo.toml                                | 6 +++---
 ggdt/src/system/event.rs                       | 9 +++++----
 ggdt/src/system/input_devices/mouse/buttons.rs | 1 +
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ggdt/Cargo.toml b/ggdt/Cargo.toml
index 92c6452..be8b439 100644
--- a/ggdt/Cargo.toml
+++ b/ggdt/Cargo.toml
@@ -11,7 +11,7 @@ byteorder = "1.4.3"
 thiserror = "=1.0.30"
 rand = "0.8.5"
 num-traits = "0.2.14"
-bitflags = "1.3"
+bitflags = "2.0.2"
 flate2 = "1.0.25"
 crc32fast = "1.3.2"
 
@@ -23,9 +23,9 @@ sdl2 = { git = "https://github.com/Rust-SDL2/rust-sdl2/", rev = "819ab438ac971a9
 
 [dev-dependencies]
 claim = "0.5.0"
-criterion = "0.3.5"
+criterion = "0.4.0"
 anyhow = "=1.0.55"
-tempfile = "3.3.0"
+tempfile = "3.4.0"
 
 [[bench]]
 name = "bitmap"
diff --git a/ggdt/src/system/event.rs b/ggdt/src/system/event.rs
index fcf6a31..438e270 100644
--- a/ggdt/src/system/event.rs
+++ b/ggdt/src/system/event.rs
@@ -15,7 +15,7 @@ use crate::system::input_devices::keyboard::codes::Keycode;
 use crate::system::input_devices::keyboard::scancodes::Scancode;
 use crate::system::input_devices::mouse::buttons::{MouseButton, MouseButtons};
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
 pub enum WindowEvent {
 	Shown,
 	Hidden,
@@ -58,6 +58,7 @@ impl From<sdl2::event::WindowEvent> for WindowEvent {
 }
 
 bitflags! {
+	#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
 	pub struct KeyModifiers: u16 {
 		const NOMOD = 0x0000;
 		const LSHIFTMOD = 0x0001;
@@ -75,7 +76,7 @@ bitflags! {
 	}
 }
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
 pub enum KeyboardEvent {
 	KeyUp {
 		keycode: Option<Keycode>, //
@@ -91,7 +92,7 @@ pub enum KeyboardEvent {
 	},
 }
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
 pub enum MouseEvent {
 	MouseMotion {
 		x: i32, //
@@ -114,7 +115,7 @@ pub enum MouseEvent {
 	},
 }
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
 pub enum SystemEvent {
 	Quit,
 	AppTerminating,
diff --git a/ggdt/src/system/input_devices/mouse/buttons.rs b/ggdt/src/system/input_devices/mouse/buttons.rs
index b1ae891..bb77cb5 100644
--- a/ggdt/src/system/input_devices/mouse/buttons.rs
+++ b/ggdt/src/system/input_devices/mouse/buttons.rs
@@ -1,6 +1,7 @@
 use bitflags::bitflags;
 
 bitflags! {
+	#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
 	pub struct MouseButtons: u32 {
 		const LEFT_BUTTON = sdl2::mouse::MouseButton::Left as u32;
 		const MIDDLE_BUTTON = sdl2::mouse::MouseButton::Middle as u32;