mab122
/
radicle-heartwood-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

term: Use static template in spinner initialization 

Use `static` + `LazyLock` to ensure that the templates evaluation only
happens once and the value can be re-used on each subsequent access.
This commit is contained in:
Fintan Halpenny 2025-09-11 10:57:38 +01:00 committed by Lorenz Leutgeb
parent 8fc37e3316
commit 66adbffd61
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
crates/radicle-term/src/spinner.rs
View File

@ -1,6 +1,6 @@
use std::io::IsTerminal; use std::io::IsTerminal;
use std::mem::ManuallyDrop; use std::mem::ManuallyDrop;
use std::sync::{Arc, Mutex}; use std::sync::{Arc, LazyLock, Mutex};
use std::{fmt, io, thread, time}; use std::{fmt, io, thread, time};
use indicatif::{ProgressBar, ProgressDrawTarget, ProgressStyle}; use indicatif::{ProgressBar, ProgressDrawTarget, ProgressStyle};
@ -16,6 +16,8 @@ pub const DEFAULT_STYLE: [Paint<&'static str>; 4] = [
Paint::magenta("◤"), Paint::magenta("◤"),
Paint::blue("◥"), Paint::blue("◥"),
]; ];
static TEMPLATE: LazyLock<ProgressStyle> =
LazyLock::new(|| ProgressStyle::with_template("{spinner:.blue} {msg}").unwrap());
impl From<PaintTarget> for ProgressDrawTarget { impl From<PaintTarget> for ProgressDrawTarget {
fn from(value: PaintTarget) -> Self { fn from(value: PaintTarget) -> Self {
@ -154,16 +156,12 @@ pub fn spinner_to(
spinner.set_draw_target(progress_target.into()); spinner.set_draw_target(progress_target.into());
spinner.set_message(message.to_string()); spinner.set_message(message.to_string());
spinner.set_style( spinner.set_style(TEMPLATE.clone().tick_strings(&[
ProgressStyle::with_template("{spinner:.blue} {msg}") DEFAULT_STYLE[0].to_string().as_str(),
.unwrap() DEFAULT_STYLE[1].to_string().as_str(),
.tick_strings(&[ DEFAULT_STYLE[2].to_string().as_str(),
DEFAULT_STYLE[0].to_string().as_str(), DEFAULT_STYLE[3].to_string().as_str(),
DEFAULT_STYLE[1].to_string().as_str(), ]));
DEFAULT_STYLE[2].to_string().as_str(),
DEFAULT_STYLE[3].to_string().as_str(),
]),
);
move || { move || {
loop { loop {