diff options
| author | tuhana <git@tuhana.me> | 2024-03-09 00:27:58 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-08 14:27:58 -0700 |
| commit | 66d1b155dd53092bddfb8da71c5ddb6e5a3601d5 (patch) | |
| tree | 0bc49ebe8a021861b28d2fb6c37ede5024e2eef4 | |
| parent | 5d85efd595e13863a443fb53a8b2954e5c6c77cc (diff) | |
fix(cli): occasional panics on progress bar (#22809)
Uses `Instant` instead of `SystemTime` for
`cli/util/progress_bar/mod.rs`. Fixes #22558
| -rw-r--r-- | cli/util/progress_bar/mod.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cli/util/progress_bar/mod.rs b/cli/util/progress_bar/mod.rs index 413062084..abafa2164 100644 --- a/cli/util/progress_bar/mod.rs +++ b/cli/util/progress_bar/mod.rs @@ -3,7 +3,7 @@ use std::sync::atomic::AtomicU64; use std::sync::atomic::Ordering; use std::sync::Arc; -use std::time::SystemTime; +use std::time::Instant; use deno_core::parking_lot::Mutex; use deno_runtime::ops::tty::ConsoleSize; @@ -122,7 +122,7 @@ struct InternalState { /// If this guard exists, then it means the progress /// bar is displaying in the draw thread. draw_thread_guard: Option<DrawThreadGuard>, - start_time: SystemTime, + start_time: Instant, keep_alive_count: usize, total_entries: usize, entries: Vec<ProgressBarEntry>, @@ -139,7 +139,7 @@ impl ProgressBarInner { Self { state: Arc::new(Mutex::new(InternalState { draw_thread_guard: None, - start_time: SystemTime::now(), + start_time: Instant::now(), keep_alive_count: 0, total_entries: 0, entries: Vec::new(), @@ -207,7 +207,7 @@ impl ProgressBarInner { if internal_state.draw_thread_guard.is_none() && internal_state.keep_alive_count > 0 { - internal_state.start_time = SystemTime::now(); + internal_state.start_time = Instant::now(); internal_state.draw_thread_guard = Some(DrawThread::add_entry(Arc::new(self.clone()))); } @@ -228,7 +228,7 @@ impl DrawThreadRenderer for ProgressBarInner { .or_else(|| state.entries.iter().last()) .unwrap(); ProgressData { - duration: state.start_time.elapsed().unwrap(), + duration: state.start_time.elapsed(), terminal_width: size.cols, pending_entries: state.entries.len(), total_entries: state.total_entries, |