Switch to once_cell

Author: theRookieCoder

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "ferium"
-version = "4.3.0"
+version = "4.3.1"
 edition = "2021"
 rust-version = "1.61" # Bound by `std::process::ExitCode`
 authors = [
@@ -9,7 +9,10 @@ authors = [
     "Daniel Hauck (SolidTux)",
 ]
 description = "Fast CLI program for managing Minecraft mods and modpacks from Modrinth, CurseForge, and Github Releases"
-exclude = ["tests", "media"] # Don't need tests and media for installing using crates.io
+exclude = [
+    "tests",
+    "media",
+] # Don't need tests and media for installing using crates.io
 repository = "https://github.com/gorilla-devs/ferium"
 categories = ["command-line-utilities"]
 readme = "README.md"
@@ -34,11 +37,11 @@ tokio = { version = "1.23", default-features = false, features = [
 ] }
 clap = { version = "4.0", features = ["derive"] }
 clap_complete = "4.0"
-lazy_static = "1.4"
 serde_json = "1.0"
 dialoguer = "0.10"
 indicatif = "0.17"
 itertools = "0.10"
+once_cell = "1.16"
 fs_extra = "1.2"
 colored = "2.0"
 ferinth = "2.7"

Cargo.toml

@@ -1,4 +1,4 @@
-use crate::{style_byte, TICK};
+use crate::{STYLE_BYTE, TICK};
 use anyhow::{anyhow, bail, Error, Result};
 use colored::Colorize;
 use fs_extra::{
@@ -19,7 +19,6 @@ use std::{
 };
 use tokio::{
     fs::{copy, create_dir_all, remove_file},
-
     sync::Semaphore,
     task::JoinSet,
 };
@@ -110,7 +109,7 @@ pub async fn download(
                 .map(|downloadable| downloadable.length)
                 .sum(),
         )
-        .with_style(style_byte()),
+        .with_style(STYLE_BYTE.clone()),
     ));
     progress_bar
         .force_lock()

src/download.rs

@@ -10,12 +10,12 @@ use dialoguer::theme::ColorfulTheme;
 use ferinth::Ferinth;
 use furse::Furse;
 use indicatif::ProgressStyle;
-use lazy_static::lazy_static;
 use libium::config::{
     self,
     structs::{Config, ModIdentifier, Modpack, Profile},
 };
 use octocrab::OctocrabBuilder;
+use once_cell::sync::Lazy;
 use online::tokio::check;
 use std::{
     env::{var, var_os},
@@ -25,29 +25,25 @@ use std::{
 use tokio::{runtime, task::JoinSet};
 
 const CROSS: &str = "×";
-lazy_static! {
-    pub static ref TICK: ColoredString = "✓".green();
-    pub static ref YELLOW_TICK: ColoredString = "✓".yellow();
-    pub static ref THEME: ColorfulTheme = ColorfulTheme::default();
-}
-
+pub static TICK: Lazy<ColoredString> = Lazy::new(|| "✓".green());
+pub static YELLOW_TICK: Lazy<ColoredString> = Lazy::new(|| "✓".yellow());
+pub static THEME: Lazy<ColorfulTheme> = Lazy::new(Default::default);
 #[allow(clippy::expect_used)]
-pub fn style_no() -> ProgressStyle {
+pub static STYLE_NO: Lazy<ProgressStyle> = Lazy::new(|| {
     ProgressStyle::default_bar()
         .template("{spinner} [{elapsed_precise}] [{wide_bar:.cyan/blue}] {pos:.cyan}/{len:.blue}")
         .expect("Progess bar template parse failure")
         .progress_chars("#>-")
-}
-
+});
 #[allow(clippy::expect_used)]
-pub fn style_byte() -> ProgressStyle {
+pub static STYLE_BYTE: Lazy<ProgressStyle> = Lazy::new(|| {
     ProgressStyle::default_bar()
         .template(
             "{spinner} [{bytes_per_sec}] [{wide_bar:.cyan/blue}] {bytes:.cyan}/{total_bytes:.blue}",
         )
         .expect("Progess bar template parse failure")
         .progress_chars("#>-")
-}
+});
 
 fn main() -> ExitCode {
     let cli = Ferium::parse();

src/main.rs

@@ -1,6 +1,6 @@
 use crate::{
     download::{clean, download, read_overrides},
-    style_byte, TICK,
+    STYLE_BYTE, TICK,
 };
 use anyhow::Result;
 use colored::Colorize;
@@ -32,7 +32,7 @@ pub async fn upgrade(modrinth: &Ferinth, curseforge: &Furse, modpack: &'_ Modpac
     match &modpack.identifier {
         ModpackIdentifier::CurseForgeModpack(project_id) => {
             println!("{}", "Downloading Modpack".bold());
-            let progress_bar = ProgressBar::new(0).with_style(style_byte());
+            let progress_bar = ProgressBar::new(0).with_style(STYLE_BYTE.clone());
             let modpack_file = download_curseforge_modpack(
                 &curseforge.clone(),
                 *project_id,
@@ -110,7 +110,7 @@ pub async fn upgrade(modrinth: &Ferinth, curseforge: &Furse, modpack: &'_ Modpac
         },
         ModpackIdentifier::ModrinthModpack(project_id) => {
             println!("{}", "Downloading Modpack".bold());
-            let progress_bar = ProgressBar::new(0).with_style(style_byte());
+            let progress_bar = ProgressBar::new(0).with_style(STYLE_BYTE.clone());
             let modpack_file = download_modrinth_modpack(
                 &modrinth.clone(),
                 project_id,

src/subcommands/modpack/upgrade.rs

@@ -1,6 +1,6 @@
 use crate::{
     download::{clean, download},
-    style_no, CROSS, TICK, YELLOW_TICK,
+    CROSS, STYLE_NO, TICK, YELLOW_TICK,
 };
 use anyhow::{anyhow, bail, Result};
 use colored::Colorize;
@@ -32,7 +32,7 @@ pub async fn upgrade(
     let profile = Arc::new(profile.clone());
     let to_download = Arc::new(Mutex::new(Vec::new()));
     let progress_bar = Arc::new(Mutex::new(
-        ProgressBar::new(profile.mods.len() as u64).with_style(style_no()),
+        ProgressBar::new(profile.mods.len() as u64).with_style(STYLE_NO.clone()),
     ));
     let backwards_compat_msg = Arc::new(AtomicBool::new(false));
     let error = Arc::new(AtomicBool::new(false));