git_ui: Combine disjoint conditions into one (#25722)

This PR combines two disjoint conditions for the same value into one.

This makes it so the type checker can accurately reason about the
branches.

Release Notes:

- N/A

crates/git_ui/src/branch_picker.rs

@@ -141,26 +141,24 @@ impl Render for BranchList {
     fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         v_flex()
             .w(rems(self.rem_width))
-            .when_some(self.picker.clone(), |div, picker| {
-                div.child(picker.clone()).on_mouse_down_out({
+            .map(|parent| match self.picker.as_ref() {
+                Some(picker) => parent.child(picker.clone()).on_mouse_down_out({
                     let picker = picker.clone();
                     cx.listener(move |_, _, window, cx| {
                         picker.update(cx, |this, cx| {
                             this.cancel(&Default::default(), window, cx);
                         })
                     })
-                })
-            })
-            .when_none(&self.picker, |div| {
-                div.child(
+                }),
+                None => parent.child(
                     h_flex()
                         .id("branch-picker-error")
                         .on_click(
                             cx.listener(|this, _, window, cx| this.reload_branches(window, cx)),
                         )
                         .child("Could not load branches.")
                         .child("Click to retry"),
-                )
+                ),
             })
     }
 }