From 9f8aba50e3396173248fad638d988ff2390791d2 Mon Sep 17 00:00:00 2001 From: Xiaopeng Li Date: Wed, 19 Apr 2023 21:57:11 +0800 Subject: [PATCH] Replace let-else --- src/platform_impl/macos/view.rs | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/src/platform_impl/macos/view.rs b/src/platform_impl/macos/view.rs index 264ed354a96..79fa17a1fd0 100644 --- a/src/platform_impl/macos/view.rs +++ b/src/platform_impl/macos/view.rs @@ -400,7 +400,11 @@ declare_class!( _actual_range: *mut c_void, // *mut NSRange ) -> NSRect { trace_scope!("firstRectForCharacterRange:actualRange:"); - let Some(window) = self.window() else { return NSRect::default(); }; + let window = if let Some(window) = self.window() { + window + } else { + return NSRect::default(); + }; let content_rect = window.contentRectForFrameRect(window.frame()); let base_x = content_rect.origin.x as f64; let base_y = (content_rect.origin.y + content_rect.size.height) as f64; @@ -472,7 +476,11 @@ declare_class!( // Get the characters from the event. let ev_mods = event_mods(event); - let Some(window) = self.window() else { return; }; + let window = if let Some(window) = self.window() { + window + } else { + return; + }; let ignore_alt_characters = match window.option_as_alt() { OptionAsAlt::OnlyLeft if event.lalt_pressed() => true, OptionAsAlt::OnlyRight if event.ralt_pressed() => true, @@ -611,7 +619,11 @@ declare_class!( #[sel(insertTab:)] fn insert_tab(&self, _sender: *const Object) { trace_scope!("insertTab:"); - let Some(window) = self.window() else { return; }; + let window = if let Some(window) = self.window() { + window + } else { + return; + }; if let Some(first_responder) = window.firstResponder() { if *first_responder == ***self { window.selectNextKeyView(Some(self)) @@ -622,7 +634,11 @@ declare_class!( #[sel(insertBackTab:)] fn insert_back_tab(&self, _sender: *const Object) { trace_scope!("insertBackTab:"); - let Some(window) = self.window() else { return; }; + let window = if let Some(window) = self.window() { + window + } else { + return; + }; if let Some(first_responder) = window.firstResponder() { if *first_responder == ***self { window.selectPreviousKeyView(Some(self))