refactor

Byron · Byron · commit 81eadf8cdfcf · 2023-12-10T09:08:12.000+01:00
Use a single version of the COUNT formatter.
diff --git a/src/interactive/widgets/entries.rs b/src/interactive/widgets/entries.rs
@@ -1,13 +1,12 @@
+use crate::interactive::widgets::COUNT;
 use crate::interactive::{
     path_of,
     widgets::{entry_color, EntryMarkMap},
     DisplayOptions, EntryDataBundle, SortMode,
 };
 use chrono::DateTime;
 use dua::traverse::{EntryData, Tree, TreeIndex};
-use human_format;
 use itertools::Itertools;
-use once_cell::sync::Lazy;
 use std::time::SystemTime;
 use std::{borrow::Borrow, path::Path};
 use tui::{
@@ -24,12 +23,6 @@ use tui_react::{
     List, ListProps,
 };
 
-static COUNT: Lazy<human_format::Formatter> = Lazy::new(|| {
-    let mut formatter = human_format::Formatter::new();
-    formatter.with_decimals(0).with_separator("");
-    formatter
-});
-
 pub struct EntriesProps<'a> {
     pub tree: &'a Tree,
     pub root: TreeIndex,
diff --git a/src/interactive/widgets/mark.rs b/src/interactive/widgets/mark.rs
@@ -1,3 +1,4 @@
+use crate::interactive::widgets::COUNT;
 use crate::interactive::{
     fit_string_graphemes_with_ellipsis, path_of, widgets::entry_color, CursorDirection,
 };
@@ -6,9 +7,7 @@ use dua::{
     traverse::{Tree, TreeIndex},
     ByteFormat,
 };
-use human_format;
 use itertools::Itertools;
-use once_cell::sync::Lazy;
 use std::{
     borrow::Borrow,
     collections::{btree_map::Entry, BTreeMap},
@@ -28,12 +27,6 @@ use tui_react::{
 };
 use unicode_segmentation::UnicodeSegmentation;
 
-static COUNT: Lazy<human_format::Formatter> = Lazy::new(|| {
-    let mut formatter = human_format::Formatter::new();
-    formatter.with_decimals(0).with_separator("");
-    formatter
-});
-
 pub enum MarkMode {
     Delete,
     #[cfg(feature = "trash-move")]
diff --git a/src/interactive/widgets/mod.rs b/src/interactive/widgets/mod.rs
@@ -11,12 +11,19 @@ pub use header::*;
 pub use help::*;
 pub use main::*;
 pub use mark::*;
+use once_cell::sync::Lazy;
 
 use tui::style::Color;
 
 pub const COLOR_MARKED: Color = Color::Yellow;
 pub const COLOR_MARKED_DARK: Color = Color::Rgb(176, 126, 0);
 
+static COUNT: Lazy<human_format::Formatter> = Lazy::new(|| {
+    let mut formatter = human_format::Formatter::new();
+    formatter.with_decimals(0).with_separator("");
+    formatter
+});
+
 fn entry_color(fg: Option<Color>, is_file: bool, is_marked: bool) -> Option<Color> {
     match (is_file, is_marked) {
         (true, false) => fg,
