oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable clippy::unnecessary_unwrap (#8756)

Browse Source 
This PR enables the
[`clippy::unnecessary_unwrap`](https://rust-lang.github.io/rust-clippy/master/index.html#/unnecessary_unwrap)
rule and fixes the outstanding violations.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers
2024-03-02 23:10:56 -05:00
committed by GitHub
parent 191fcf67d1
commit 373e18bc88
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ui/src/components/popover_menu.rs
+4 -2
View File
@@ -51,8 +51,10 @@ impl<M: ManagedView> PopoverMenu<M> {
cx.subscribe(&new_menu, move |modal, _: &DismissEvent, cx| {
if modal.focus_handle(cx).contains_focused(cx) {
if previous_focus_handle.is_some() {
cx.focus(previous_focus_handle.as_ref().unwrap())
if let Some(previous_focus_handle) =
previous_focus_handle.as_ref()
{
cx.focus(previous_focus_handle);
}
}
*menu2.borrow_mut() = None;
crates/ui/src/components/right_click_menu.rs
+8 -7
View File
@@ -154,8 +154,8 @@ impl<M: ManagedView> Element for RightClickMenu<M> {
cx.subscribe(&new_menu, move |modal, _: &DismissEvent, cx| {
if modal.focus_handle(cx).contains_focused(cx) {
if previous_focus_handle.is_some() {
cx.focus(previous_focus_handle.as_ref().unwrap())
if let Some(previous_focus_handle) = previous_focus_handle.as_ref() {
cx.focus(previous_focus_handle);
}
}
*menu2.borrow_mut() = None;
@@ -165,11 +165,12 @@ impl<M: ManagedView> Element for RightClickMenu<M> {
cx.focus_view(&new_menu);
*menu.borrow_mut() = Some(new_menu);
*position.borrow_mut() = if attach.is_some() && child_layout_id.is_some() {
attach.unwrap().corner(child_bounds)
} else {
cx.mouse_position()
};
*position.borrow_mut() =
if let Some(attach) = attach.filter(|_| child_layout_id.is_some()) {
attach.corner(child_bounds)
} else {
cx.mouse_position()
};
cx.refresh();
}
});