From 6e7a6732c89f6e0d68d9c88a2e7af3dacd86cca6 Mon Sep 17 00:00:00 2001 From: wmedrano Date: Sat, 30 Dec 2017 04:36:13 +0000 Subject: [PATCH] derive debug for Event --- src/sdl2/event.rs | 48 +------------------------------------------ src/sdl2/mouse/mod.rs | 2 +- 2 files changed, 2 insertions(+), 48 deletions(-) diff --git a/src/sdl2/event.rs b/src/sdl2/event.rs index d613ceb7391..d32d947010f 100644 --- a/src/sdl2/event.rs +++ b/src/sdl2/event.rs @@ -451,7 +451,7 @@ impl WindowEvent { } -#[derive(Clone, PartialEq)] +#[derive(Clone, PartialEq, Debug)] /// Different event types. pub enum Event { Quit { timestamp: u32 }, @@ -709,52 +709,6 @@ pub enum Event { } } -impl ::std::fmt::Debug for Event { - fn fmt(&self, out: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - out.write_str(match *self { - Event::Quit{..} => "Event::Quit", - Event::AppTerminating{..} => "Event::AppTerminating", - Event::AppLowMemory{..} => "Event::AppLowMemory", - Event::AppWillEnterBackground{..} => "Event::AppWillEnterBackground", - Event::AppDidEnterBackground{..} => "Event::AppDidEnterBackground", - Event::AppWillEnterForeground{..} => "Event::AppWillEnterForeground", - Event::AppDidEnterForeground{..} => "Event::AppDidEnterForeground", - Event::Window{..} => "Event::Window", - Event::KeyDown{..} => "Event::KeyDown", - Event::KeyUp{..} => "Event::KeyUp", - Event::TextEditing{..} => "Event::TextEditing", - Event::TextInput{..} => "Event::TextInput", - Event::MouseMotion{..} => "Event::MouseMotion", - Event::MouseButtonDown{..} => "Event::MouseButtonDown", - Event::MouseButtonUp{..} => "Event::MouseButtonUp", - Event::MouseWheel{..} => "Event::MouseWheel", - Event::JoyAxisMotion{..} => "Event::JoyAxisMotion", - Event::JoyBallMotion{..} => "Event::JoyBallMotion", - Event::JoyHatMotion{..} => "Event::JoyHatMotion", - Event::JoyButtonDown{..} => "Event::JoyButtonDown", - Event::JoyButtonUp{..} => "Event::JoyButtonUp", - Event::JoyDeviceAdded{..} => "Event::JoyDeviceAdded", - Event::JoyDeviceRemoved{..} => "Event::JoyDeviceRemoved", - Event::ControllerAxisMotion{..} => "Event::ControllerAxisMotion", - Event::ControllerButtonDown{..} => "Event::ControllerButtonDown", - Event::ControllerButtonUp{..} => "Event::ControllerButtonUp", - Event::ControllerDeviceAdded{..} => "Event::ControllerDeviceAdded", - Event::ControllerDeviceRemoved{..} => "Event::ControllerDeviceRemoved", - Event::ControllerDeviceRemapped{..} => "Event::ControllerDeviceRemapped", - Event::FingerDown{..} => "Event::FingerDown", - Event::FingerUp{..} => "Event::FingerUp", - Event::FingerMotion{..} => "Event::FingerMotion", - Event::DollarGesture{..} => "Event::DollarGesture", - Event::DollarRecord{..} => "Event::DollarRecord", - Event::MultiGesture{..} => "Event::MultiGesture", - Event::ClipboardUpdate{..} => "Event::ClipboardUpdate", - Event::DropFile{..} => "Event::DropFile", - Event::User{..} => "Event::User", - Event::Unknown{..} => "Event::Unknown", - }) - } -} - /// Helper function to make converting scancodes /// and keycodes to primitive `SDL_Keysym` types. fn mk_keysym(scancode: S, diff --git a/src/sdl2/mouse/mod.rs b/src/sdl2/mouse/mod.rs index 19c706bf1f5..38a9dbefa41 100644 --- a/src/sdl2/mouse/mod.rs +++ b/src/sdl2/mouse/mod.rs @@ -151,7 +151,7 @@ impl MouseButton { } } -#[derive(Copy, Clone, Eq, PartialEq, Hash)] +#[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)] pub struct MouseState { mouse_state: u32, x: i32,