update dependencies

This commit is contained in:
Gered 2023-03-28 14:04:48 -04:00
parent 6973d5e039
commit aa22786d43
3 changed files with 9 additions and 7 deletions

View file

@ -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"

View file

@ -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,

View file

@ -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;