Skip to content

Commit 8bdc59b

Browse files
get_wrapped_event: Deduplicate some match branches
1 parent a9ed766 commit 8bdc59b

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

src/ext/event.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,18 +112,17 @@ pub fn get_wrapped_event(event: &mut ::csfml_window_sys::sfEvent) -> event::Even
112112
sys::sfEvtLostFocus => event::LostFocus,
113113
sys::sfEvtGainedFocus => event::GainedFocus,
114114
sys::sfEvtTextEntered => text(event),
115-
sys::sfEvtKeyPressed => key(event, type_),
116-
sys::sfEvtKeyReleased => key(event, type_),
115+
sys::sfEvtKeyPressed | sys::sfEvtKeyReleased => key(event, type_),
117116
sys::sfEvtMouseWheelMoved => mouse_wheel(event),
118-
sys::sfEvtMouseButtonPressed => mouse_button(event, type_),
117+
sys::sfEvtMouseButtonPressed |
119118
sys::sfEvtMouseButtonReleased => mouse_button(event, type_),
120119
sys::sfEvtMouseMoved => mouse_move(event),
121120
sys::sfEvtMouseEntered => event::MouseEntered,
122121
sys::sfEvtMouseLeft => event::MouseLeft,
123-
sys::sfEvtJoystickButtonPressed => joystick_button(event, type_),
122+
sys::sfEvtJoystickButtonPressed |
124123
sys::sfEvtJoystickButtonReleased => joystick_button(event, type_),
125124
sys::sfEvtJoystickMoved => joystick_move(event),
126-
sys::sfEvtJoystickConnected => joystick_connect(event, type_),
125+
sys::sfEvtJoystickConnected |
127126
sys::sfEvtJoystickDisconnected => joystick_connect(event, type_),
128127
_ => event::NoEvent
129128
}

0 commit comments

Comments
 (0)