@@ -211,14 +211,14 @@ impl ContextImpl {
211211 fn requested_immediate_repaint_prev_pass ( & self , viewport_id : & ViewportId ) -> bool {
212212 self . viewports
213213 . get ( viewport_id)
214- . map_or ( false , |v| v. repaint . requested_immediate_repaint_prev_pass ( ) )
214+ . is_some_and ( |v| v. repaint . requested_immediate_repaint_prev_pass ( ) )
215215 }
216216
217217 #[ must_use]
218218 fn has_requested_repaint ( & self , viewport_id : & ViewportId ) -> bool {
219- self . viewports . get ( viewport_id ) . map_or ( false , |v| {
220- 0 < v . repaint . outstanding || v . repaint . repaint_delay < Duration :: MAX
221- } )
219+ self . viewports
220+ . get ( viewport_id )
221+ . is_some_and ( |v| 0 < v . repaint . outstanding || v . repaint . repaint_delay < Duration :: MAX )
222222 }
223223}
224224
@@ -1214,7 +1214,7 @@ impl Context {
12141214 #[ deprecated = "Use Response.contains_pointer or Context::read_response instead" ]
12151215 pub fn widget_contains_pointer ( & self , id : Id ) -> bool {
12161216 self . read_response ( id)
1217- . map_or ( false , |response| response. contains_pointer ( ) )
1217+ . is_some_and ( |response| response. contains_pointer ( ) )
12181218 }
12191219
12201220 /// Do all interaction for an existing widget, without (re-)registering it.
@@ -2632,7 +2632,7 @@ impl Context {
26322632 pub fn is_context_menu_open ( & self ) -> bool {
26332633 self . data ( |d| {
26342634 d. get_temp :: < crate :: menu:: BarState > ( menu:: CONTEXT_MENU_ID_STR . into ( ) )
2635- . map_or ( false , |state| state. has_root ( ) )
2635+ . is_some_and ( |state| state. has_root ( ) )
26362636 } )
26372637 }
26382638}
0 commit comments