@@ -2147,8 +2147,8 @@ where
2147
2147
let window_event = match request {
2148
2148
Terminate => return Ok ( TerminalAction :: Quit ( ( ) ) ) ,
2149
2149
WindowSwitch { window, created } => {
2150
- let uid = window. as_ref ( ) . either ( |win| win. uid ( ) , |uid| & uid) ;
2151
- if window_stack. window_position ( & uid) . is_some ( ) {
2150
+ let uid = window. as_ref ( ) . either ( |win| win. uid ( ) , |uid| uid) ;
2151
+ if window_stack. window_position ( uid) . is_some ( ) {
2152
2152
_ = created. send ( false ) ;
2153
2153
WindowAction :: Switch {
2154
2154
uid : uid. clone ( ) ,
@@ -2157,22 +2157,19 @@ where
2157
2157
}
2158
2158
} else {
2159
2159
_ = created. send ( true ) ;
2160
- let window = window. either (
2161
- |win| Ok :: < _ , Error > ( win) ,
2162
- |uid| {
2163
- let win = Box :: new ( SweepWindow :: new_from_options (
2164
- SweepOptions {
2165
- window_uid : uid. clone ( ) ,
2166
- ..options. clone ( )
2167
- } ,
2168
- haystack_context. clone ( ) ,
2169
- term. waker ( ) ,
2170
- Some ( window_dispatch. create ( uid) ?) ,
2171
- event_handler_default. clone ( ) ,
2172
- ) ) ;
2173
- Ok ( win)
2174
- } ,
2175
- ) ?;
2160
+ let window = window. either ( Ok :: < _ , Error > , |uid| {
2161
+ let win = Box :: new ( SweepWindow :: new_from_options (
2162
+ SweepOptions {
2163
+ window_uid : uid. clone ( ) ,
2164
+ ..options. clone ( )
2165
+ } ,
2166
+ haystack_context. clone ( ) ,
2167
+ term. waker ( ) ,
2168
+ Some ( window_dispatch. create ( uid) ?) ,
2169
+ event_handler_default. clone ( ) ,
2170
+ ) ) ;
2171
+ Ok ( win)
2172
+ } ) ?;
2176
2173
WindowAction :: Open { window }
2177
2174
}
2178
2175
}
0 commit comments