remove dependencies

m00nwtchr · Jul 31, 2024 · 4a45a31 · 4a45a31
1 parent b5dcdcf
commit 4a45a31
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 28 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -39,10 +39,8 @@ cofd = { git = "https://github.com/m00nwtchr/cofd.git" }
 #codex-scraper = { git = "https://github.com/m00nwtchr/cofd-miner.git" }
 
 closure = "0.3"
-lazy_static = "1"
-cfg-if = "1"
-itertools = "0.13"
 once_cell = "1.4"
+
 anyhow = "1"
 log = "0.4"
 

diff --git a/src/component/integrity.rs b/src/component/integrity.rs
@@ -168,7 +168,7 @@ impl IntegrityComponent {
 						fl!("touchstones"),
 						Some(10),
 						Some(10),
-						character.touchstones.clone() as Vec<String>,
+						character.touchstones.clone(),
 						|i, val| {
 							text_input("", &val.unwrap_or_default())
 								.on_input(move |val| Message::TouchstoneChanged(i, val))

diff --git a/src/component/skills.rs b/src/component/skills.rs
@@ -119,14 +119,11 @@ impl SkillsComponent {
 				);
 			}
 
-			let specialties = if let Some(specialties) = character.specialties.get(&skill) {
-				specialties
-			} else {
-				lazy_static::lazy_static! {
-					static ref DEFAULT: Vec<String> = vec![];
-				}
-				&DEFAULT
-			};
+			let specialties = character
+				.specialties
+				.get(&skill)
+				.cloned()
+				.unwrap_or_default();
 
 			col1 = col1.push(
 				button(text(skill.translated()).style(if specialties.is_empty() {
@@ -158,7 +155,7 @@ impl SkillsComponent {
 						String::new(),
 						Some(specialties.len() + 1),
 						None,
-						specialties.clone(),
+						specialties,
 						move |i, val| {
 							text_input("", &val.unwrap_or_default())
 								.on_input(move |val| Message::Specialty(skill, i, val))

diff --git a/src/i18n.rs b/src/i18n.rs
@@ -1,5 +1,3 @@
-use crate::i18n;
-use cfg_if::cfg_if;
 use cofd::prelude::{Template, VariantName};
 use cofd::splat::ability::Ability;
 use cofd::splat::changeling::Regalia;
@@ -18,7 +16,7 @@ use i18n_embed::{
 	fluent::{fluent_language_loader, FluentLanguageLoader},
 	DefaultLocalizer, LanguageLoader, LanguageRequester, Localizer,
 };
-use once_cell::sync::{Lazy, OnceCell};
+use once_cell::sync::Lazy;
 use rust_embed::RustEmbed;
 use std::fmt::Display;
 use std::ops::Deref;
@@ -77,15 +75,10 @@ pub fn setup() -> anyhow::Result<Box<dyn LanguageRequester<'static>>> {
 	let localizer: Arc<dyn Localizer> =
 		Arc::new(DefaultLocalizer::new(&*LANGUAGE_LOADER, &Localizations));
 
-	let mut language_requester = Box::new({
-		cfg_if! {
-			if #[cfg(target_arch = "wasm32")] {
-				i18n_embed::WebLanguageRequester::new()
-			} else {
-				i18n_embed::DesktopLanguageRequester::new()
-			}
-		}
-	});
+	#[cfg(not(target_arch = "wasm32"))]
+	let mut language_requester = Box::new(i18n_embed::DesktopLanguageRequester::new());
+	#[cfg(target_arch = "wasm32")]
+	let mut language_requester = Box::new(i18n_embed::WebLanguageRequester::new());
 
 	language_requester.add_listener(Arc::downgrade(&localizer));
 	language_requester.poll()?;