Skip to content

Commit bf481e3

Browse files
raphamorimraphamorim
committed
use if let Some instead of single match
1 parent c57d1c5 commit bf481e3

File tree

1 file changed

+97
-149
lines changed

1 file changed

+97
-149
lines changed

‎wa/src/native/macos.rs

Lines changed: 97 additions & 149 deletions
Original file line numberDiff line numberDiff line change
@@ -948,19 +948,15 @@ unsafe fn view_base_decl(decl: &mut ClassDecl) {
948948
dragged_files.push(std::path::PathBuf::from(path));
949949
}
950950

951-
if let Some(app_handler) = get_app_handler(&Some(payload.app)) {
952-
match app_handler {
953-
&mut HandlerState::Running {
954-
ref mut handler, ..
955-
} => {
956-
handler.files_dragged_event(
957-
payload.id,
958-
dragged_files,
959-
crate::DragState::Entered,
960-
);
961-
}
962-
_ => {}
963-
}
951+
if let Some(&mut HandlerState::Running {
952+
ref mut handler, ..
953+
}) = get_app_handler(&Some(payload.app))
954+
{
955+
handler.files_dragged_event(
956+
payload.id,
957+
dragged_files,
958+
crate::DragState::Entered,
959+
);
964960
}
965961
}
966962
}
@@ -971,19 +967,11 @@ unsafe fn view_base_decl(decl: &mut ClassDecl) {
971967
extern "C" fn dragging_exited(this: &Object, _: Sel, _sender: ObjcId) {
972968
log::info!("dragging_exited");
973969
if let Some(payload) = get_display_payload(this) {
974-
if let Some(app_handler) = get_app_handler(&Some(payload.app)) {
975-
match app_handler {
976-
&mut HandlerState::Running {
977-
ref mut handler, ..
978-
} => {
979-
handler.files_dragged_event(
980-
payload.id,
981-
vec![],
982-
crate::DragState::Exited,
983-
);
984-
}
985-
_ => {}
986-
}
970+
if let Some(&mut HandlerState::Running {
971+
ref mut handler, ..
972+
}) = get_app_handler(&Some(payload.app))
973+
{
974+
handler.files_dragged_event(payload.id, vec![], crate::DragState::Exited);
987975
}
988976
}
989977
}
@@ -1004,15 +992,11 @@ unsafe fn view_base_decl(decl: &mut ClassDecl) {
1004992
dropped_files.push(std::path::PathBuf::from(path));
1005993
}
1006994

1007-
if let Some(app_handler) = get_app_handler(&Some(payload.app)) {
1008-
match app_handler {
1009-
&mut HandlerState::Running {
1010-
ref mut handler, ..
1011-
} => {
1012-
handler.files_dropped_event(payload.id, dropped_files);
1013-
}
1014-
_ => {}
1015-
}
995+
if let Some(&mut HandlerState::Running {
996+
ref mut handler, ..
997+
}) = get_app_handler(&Some(payload.app))
998+
{
999+
handler.files_dropped_event(payload.id, dropped_files);
10161000
}
10171001
}
10181002
}
@@ -1046,15 +1030,11 @@ unsafe fn view_base_decl(decl: &mut ClassDecl) {
10461030
.unwrap()
10471031
.quit_requested = true;
10481032

1049-
if let Some(app_handler) = get_app_handler(&Some(payload.app)) {
1050-
match app_handler {
1051-
&mut HandlerState::Running {
1052-
ref mut handler, ..
1053-
} => {
1054-
handler.quit_requested_event();
1055-
}
1056-
_ => {}
1057-
}
1033+
if let Some(&mut HandlerState::Running {
1034+
ref mut handler, ..
1035+
}) = get_app_handler(&Some(payload.app))
1036+
{
1037+
handler.quit_requested_event();
10581038
}
10591039

10601040
// user code hasn't intervened, quit the app
@@ -1137,20 +1117,16 @@ unsafe fn view_base_decl(decl: &mut ClassDecl) {
11371117
if let Some(key) = get_event_keycode(event) {
11381118
// if let Some(event_handler) = payload.context() {
11391119

1140-
if let Some(app_handler) = get_app_handler(&Some(payload.app)) {
1141-
match app_handler {
1142-
&mut HandlerState::Running {
1143-
ref mut handler, ..
1144-
} => {
1145-
handler.key_down_event(
1146-
payload.id,
1147-
key,
1148-
repeat,
1149-
get_event_char(event),
1150-
);
1151-
}
1152-
_ => {}
1153-
}
1120+
if let Some(&mut HandlerState::Running {
1121+
ref mut handler, ..
1122+
}) = get_app_handler(&Some(payload.app))
1123+
{
1124+
handler.key_down_event(
1125+
payload.id,
1126+
key,
1127+
repeat,
1128+
get_event_char(event),
1129+
);
11541130
}
11551131

11561132
// }
@@ -1162,15 +1138,11 @@ unsafe fn view_base_decl(decl: &mut ClassDecl) {
11621138
extern "C" fn appearance_did_change(this: &Object, _sel: Sel, _app: ObjcId) {
11631139
log::info!("appearance_did_change");
11641140
if let Some(payload) = get_display_payload(this) {
1165-
if let Some(app_handler) = get_app_handler(&Some(payload.app)) {
1166-
match app_handler {
1167-
&mut HandlerState::Running {
1168-
ref mut handler, ..
1169-
} => {
1170-
handler.appearance_change_event(payload.id, App::appearance());
1171-
}
1172-
_ => {}
1173-
}
1141+
if let Some(&mut HandlerState::Running {
1142+
ref mut handler, ..
1143+
}) = get_app_handler(&Some(payload.app))
1144+
{
1145+
handler.appearance_change_event(payload.id, App::appearance());
11741146
}
11751147
}
11761148
}
@@ -1179,15 +1151,11 @@ unsafe fn view_base_decl(decl: &mut ClassDecl) {
11791151
if let Some(payload) = get_display_payload(this) {
11801152
if let Some(key) = get_event_keycode(event) {
11811153
log::info!("KEY_UP (key={:?}", key);
1182-
if let Some(app_handler) = get_app_handler(&Some(payload.app)) {
1183-
match app_handler {
1184-
&mut HandlerState::Running {
1185-
ref mut handler, ..
1186-
} => {
1187-
handler.key_up_event(payload.id, key);
1188-
}
1189-
_ => {}
1190-
}
1154+
if let Some(&mut HandlerState::Running {
1155+
ref mut handler, ..
1156+
}) = get_app_handler(&Some(payload.app))
1157+
{
1158+
handler.key_up_event(payload.id, key);
11911159
}
11921160
}
11931161
}
@@ -1203,15 +1171,11 @@ unsafe fn view_base_decl(decl: &mut ClassDecl) {
12031171
) {
12041172
if new_pressed ^ old_pressed {
12051173
// if new_pressed {
1206-
if let Some(app_handler) = get_app_handler(&Some(payload.app)) {
1207-
match app_handler {
1208-
&mut HandlerState::Running {
1209-
ref mut handler, ..
1210-
} => {
1211-
handler.modifiers_event(payload.id, keycode, mods);
1212-
}
1213-
_ => {}
1214-
}
1174+
if let Some(&mut HandlerState::Running {
1175+
ref mut handler, ..
1176+
}) = get_app_handler(&Some(payload.app))
1177+
{
1178+
handler.modifiers_event(payload.id, keycode, mods);
12151179
}
12161180
// } else {
12171181
// event_handler.modifiers_event(payload.id, keycode, mods);
@@ -1456,22 +1420,18 @@ extern "C" fn draw_rect(this: &Object, _sel: Sel, _rect: NSRect) {
14561420
if !payload.has_initialized {
14571421
unsafe { payload.update_dimensions() };
14581422

1459-
if let Some(app_handler) = get_app_handler(&Some(payload.app)) {
1460-
match app_handler {
1461-
&mut HandlerState::Running {
1462-
ref mut handler, ..
1463-
} => {
1464-
handler.resize_event(
1465-
payload.id,
1466-
payload.screen_width,
1467-
payload.screen_height,
1468-
payload.dpi_scale,
1469-
true,
1470-
);
1471-
payload.has_initialized = true;
1472-
}
1473-
_ => {}
1474-
}
1423+
if let Some(&mut HandlerState::Running {
1424+
ref mut handler, ..
1425+
}) = get_app_handler(&Some(payload.app))
1426+
{
1427+
handler.resize_event(
1428+
payload.id,
1429+
payload.screen_width,
1430+
payload.screen_height,
1431+
payload.dpi_scale,
1432+
true,
1433+
);
1434+
payload.has_initialized = true;
14751435
}
14761436
}
14771437
}
@@ -1805,28 +1765,20 @@ impl App {
18051765
}
18061766

18071767
pub fn create_window() {
1808-
if let Some(app_handler) = get_app_handler(&None) {
1809-
match app_handler {
1810-
&mut HandlerState::Running {
1811-
ref mut handler, ..
1812-
} => {
1813-
handler.create_window();
1814-
}
1815-
_ => {}
1816-
}
1768+
if let Some(&mut HandlerState::Running {
1769+
ref mut handler, ..
1770+
}) = get_app_handler(&None)
1771+
{
1772+
handler.create_window();
18171773
}
18181774
}
18191775

18201776
pub fn create_tab(tab_payload: Option<&str>) {
1821-
if let Some(app_handler) = get_app_handler(&None) {
1822-
match app_handler {
1823-
&mut HandlerState::Running {
1824-
ref mut handler, ..
1825-
} => {
1826-
handler.create_tab(tab_payload);
1827-
}
1828-
_ => {}
1829-
}
1777+
if let Some(&mut HandlerState::Running {
1778+
ref mut handler, ..
1779+
}) = get_app_handler(&None)
1780+
{
1781+
handler.create_tab(tab_payload);
18301782
}
18311783
}
18321784

@@ -1848,23 +1800,23 @@ impl App {
18481800
match event {
18491801
QueuedEvent::Window(window_id, event) => match event {
18501802
WindowEvent::Focus(focus) => {
1851-
match app_state.handler {
1852-
Some(HandlerState::Running {
1853-
ref mut handler,
1854-
..
1855-
}) => handler.focus_event(window_id, focus),
1856-
_ => {}
1857-
};
1803+
if let Some(HandlerState::Running {
1804+
ref mut handler,
1805+
..
1806+
}) = app_state.handler
1807+
{
1808+
handler.focus_event(window_id, focus);
1809+
}
18581810
}
18591811
WindowEvent::MouseMotion(pos_x, pos_y) => {
1860-
match app_state.handler {
1861-
Some(HandlerState::Running {
1862-
ref mut handler,
1863-
..
1864-
}) => handler.mouse_motion_event(
1812+
if let Some(HandlerState::Running {
1813+
ref mut handler,
1814+
..
1815+
}) = app_state.handler
1816+
{
1817+
handler.mouse_motion_event(
18651818
window_id, pos_x, pos_y,
1866-
),
1867-
_ => {}
1819+
);
18681820
};
18691821
}
18701822
WindowEvent::Resize(
@@ -1873,18 +1825,18 @@ impl App {
18731825
scale_factor,
18741826
rescale,
18751827
) => {
1876-
match app_state.handler {
1877-
Some(HandlerState::Running {
1878-
ref mut handler,
1879-
..
1880-
}) => handler.resize_event(
1828+
if let Some(HandlerState::Running {
1829+
ref mut handler,
1830+
..
1831+
}) = app_state.handler
1832+
{
1833+
handler.resize_event(
18811834
window_id,
18821835
width,
18831836
height,
18841837
scale_factor,
18851838
rescale,
1886-
),
1887-
_ => {}
1839+
);
18881840
};
18891841
}
18901842
},
@@ -1945,15 +1897,11 @@ impl App {
19451897
unsafe {
19461898
let pool: ObjcId = msg_send![class!(NSAutoreleasePool), new];
19471899

1948-
if let Some(app_handler) = get_app_handler(&Some(*self.app_delegate)) {
1949-
match app_handler {
1950-
&mut HandlerState::Running {
1951-
ref mut handler, ..
1952-
} => {
1953-
handler.start();
1954-
}
1955-
_ => {}
1956-
}
1900+
if let Some(&mut HandlerState::Running {
1901+
ref mut handler, ..
1902+
}) = get_app_handler(&Some(*self.app_delegate))
1903+
{
1904+
handler.start();
19571905
}
19581906

19591907
let () = msg_send![*self.inner, finishLaunching];

0 commit comments

Comments
 (0)