@@ -65,22 +65,21 @@ use crossterm::{
65
65
} ;
66
66
use input:: { Input , InputEvent , InputState } ;
67
67
use keys:: KeyConfig ;
68
- use ratatui:: {
69
- backend:: { Backend , CrosstermBackend } ,
70
- Terminal ,
71
- } ;
68
+ use ratatui:: backend:: CrosstermBackend ;
72
69
use scopeguard:: defer;
73
70
use scopetime:: scope_time;
74
71
use spinner:: Spinner ;
75
72
use std:: {
76
73
cell:: RefCell ,
77
- io:: { self , Write } ,
74
+ io:: { self , Stdout } ,
78
75
panic, process,
79
76
time:: { Duration , Instant } ,
80
77
} ;
81
78
use ui:: style:: Theme ;
82
79
use watcher:: RepoWatcher ;
83
80
81
+ type Terminal = ratatui:: Terminal < CrosstermBackend < io:: Stdout > > ;
82
+
84
83
static TICK_INTERVAL : Duration = Duration :: from_secs ( 5 ) ;
85
84
static SPINNER_INTERVAL : Duration = Duration :: from_millis ( 80 ) ;
86
85
@@ -182,7 +181,7 @@ fn run_app(
182
181
key_config : KeyConfig ,
183
182
input : & Input ,
184
183
updater : Updater ,
185
- terminal : & mut Terminal < CrosstermBackend < io :: Stdout > > ,
184
+ terminal : & mut Terminal ,
186
185
) -> Result < QuitState , anyhow:: Error > {
187
186
let ( tx_git, rx_git) = unbounded ( ) ;
188
187
let ( tx_app, rx_app) = unbounded ( ) ;
@@ -301,10 +300,7 @@ fn shutdown_terminal() {
301
300
}
302
301
}
303
302
304
- fn draw < B : Backend > (
305
- terminal : & mut Terminal < B > ,
306
- app : & App ,
307
- ) -> io:: Result < ( ) > {
303
+ fn draw ( terminal : & mut Terminal , app : & App ) -> io:: Result < ( ) > {
308
304
if app. requires_redraw ( ) {
309
305
terminal. resize ( terminal. size ( ) ?) ?;
310
306
}
@@ -363,9 +359,7 @@ fn select_event(
363
359
Ok ( ev)
364
360
}
365
361
366
- fn start_terminal < W : Write > (
367
- buf : W ,
368
- ) -> io:: Result < Terminal < CrosstermBackend < W > > > {
362
+ fn start_terminal ( buf : Stdout ) -> io:: Result < Terminal > {
369
363
let backend = CrosstermBackend :: new ( buf) ;
370
364
let mut terminal = Terminal :: new ( backend) ?;
371
365
terminal. hide_cursor ( ) ?;
0 commit comments