move get_style and format_number in utils

Author: o2sh

src/info/author.rs

@@ -1,7 +1,7 @@
 use super::git::metrics::GitMetrics;
 use crate::{
     cli::NumberSeparator,
-    info::{format_number, utils::info_field::InfoField},
+    info::utils::{format_number, info_field::InfoField},
 };
 use serde::Serialize;
 use std::fmt::Write;

src/info/churn.rs

@@ -1,5 +1,5 @@
 use super::{git::metrics::GitMetrics, utils::info_field::InfoField};
-use crate::{cli::NumberSeparator, info::format_number};
+use crate::{cli::NumberSeparator, info::utils::format_number};
 use serde::Serialize;
 use std::fmt::Write;
 

src/info/commits.rs

@@ -1,7 +1,7 @@
 use super::git::metrics::GitMetrics;
 use crate::{
     cli::NumberSeparator,
-    info::{format_number, utils::info_field::InfoField},
+    info::utils::{format_number, info_field::InfoField},
 };
 use serde::Serialize;
 

src/info/contributors.rs

@@ -1,8 +1,5 @@
-use super::git::metrics::GitMetrics;
-use crate::{
-    cli::NumberSeparator,
-    info::{format_number, utils::info_field::InfoField},
-};
+use super::{git::metrics::GitMetrics, utils::format_number};
+use crate::{cli::NumberSeparator, info::utils::info_field::InfoField};
 use serde::Serialize;
 
 #[derive(Serialize)]

src/info/dependencies.rs

@@ -1,6 +1,6 @@
 use crate::{
     cli::NumberSeparator,
-    info::{format_number, utils::info_field::InfoField},
+    info::utils::{format_number, info_field::InfoField},
 };
 use onefetch_manifest::Manifest;
 use serde::Serialize;

src/info/loc.rs

@@ -2,10 +2,9 @@ use crate::info::langs::get_total_loc;
 use crate::info::langs::language::Language;
 use serde::Serialize;
 
-use crate::{
-    cli::NumberSeparator,
-    info::{format_number, utils::info_field::InfoField},
-};
+use crate::{cli::NumberSeparator, info::utils::info_field::InfoField};
+
+use super::utils::format_number;
 
 #[derive(Serialize)]
 #[serde(rename_all = "camelCase")]

src/info/mod.rs

@@ -27,9 +27,8 @@ use crate::ui::text_colors::TextColors;
 use anyhow::{Context, Result};
 use gix::sec::trust::Mapping;
 use gix::Repository;
-use num_format::ToFormattedString;
 use onefetch_manifest::Manifest;
-use owo_colors::{DynColors, OwoColorize, Style};
+use owo_colors::{DynColors, OwoColorize};
 use serde::Serialize;
 use std::path::Path;
 
@@ -409,14 +408,6 @@ impl InfoBuilder {
     }
 }
 
-fn get_style(is_bold: bool, color: DynColors) -> Style {
-    let mut style = Style::new().color(color);
-    if is_bold {
-        style = style.bold();
-    }
-    style
-}
-
 fn get_manifest(repo_path: &Path) -> Result<Option<Manifest>> {
     let manifests = onefetch_manifest::get_manifests(repo_path)?;
 
@@ -433,51 +424,3 @@ pub fn get_work_dir(repo: &gix::Repository) -> Result<std::path::PathBuf> {
         .context("please run onefetch inside of a non-bare git repository")?
         .to_owned())
 }
-
-fn format_number<T: ToFormattedString + std::fmt::Display>(
-    number: &T,
-    number_separator: NumberSeparator,
-) -> String {
-    number.to_formatted_string(&number_separator.get_format())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use owo_colors::AnsiColors;
-
-    #[test]
-    fn test_get_style() {
-        let style = get_style(true, DynColors::Ansi(AnsiColors::Cyan));
-        assert_eq!(
-            style,
-            Style::new().color(DynColors::Ansi(AnsiColors::Cyan)).bold()
-        );
-    }
-
-    #[test]
-    fn test_get_style_no_bold() {
-        let style = get_style(false, DynColors::Ansi(AnsiColors::Cyan));
-        assert_eq!(style, Style::new().color(DynColors::Ansi(AnsiColors::Cyan)));
-    }
-
-    #[test]
-    fn test_format_number() {
-        assert_eq!(
-            &format_number(&1_000_000, NumberSeparator::Comma),
-            "1,000,000"
-        );
-        assert_eq!(
-            &format_number(&1_000_000, NumberSeparator::Space),
-            "1\u{202f}000\u{202f}000"
-        );
-        assert_eq!(
-            &format_number(&1_000_000, NumberSeparator::Underscore),
-            "1_000_000"
-        );
-        assert_eq!(
-            &format_number(&1_000_000, NumberSeparator::Plain),
-            "1000000"
-        );
-    }
-}

src/info/project.rs

@@ -1,13 +1,12 @@
-use crate::{
-    cli::NumberSeparator,
-    info::{format_number, utils::info_field::InfoField},
-};
+use crate::{cli::NumberSeparator, info::utils::info_field::InfoField};
 use anyhow::Result;
 use gix::{bstr::ByteSlice, Repository};
 use onefetch_manifest::Manifest;
 use serde::Serialize;
 use std::ffi::OsStr;
 
+use super::utils::format_number;
+
 #[derive(Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct ProjectInfo {

src/info/size.rs

@@ -1,6 +1,6 @@
 use crate::{
     cli::NumberSeparator,
-    info::{format_number, utils::info_field::InfoField},
+    info::utils::{format_number, info_field::InfoField},
 };
 use byte_unit::Byte;
 use gix::Repository;

src/info/title.rs

@@ -1,5 +1,4 @@
-use super::get_style;
-use crate::cli;
+use crate::{cli, info::utils::get_style};
 use gix::Repository;
 use owo_colors::{DynColors, OwoColorize};
 use serde::Serialize;