From 99c24a11dbfb2e06f608ca1c3c9b8676ee0f7d0e Mon Sep 17 00:00:00 2001 From: Barafu Albino Cheetah Date: Sun, 13 Oct 2024 09:53:34 +0300 Subject: [PATCH] Fix warnings --- {src.old => oldscr}/dreamconfig.rs | 0 {src.old => oldscr}/dreams.rs | 0 {src.old => oldscr}/dreams/dendraclock.rs | 0 {src.old => oldscr}/dreams/monet.rs | 0 {src.old => oldscr}/dreams/solid_color.rs | 0 {src.old => oldscr}/dreamspinner.rs | 0 {src.old => oldscr}/lib.rs | 0 {src.old => oldscr}/main.rs | 0 src-tauri/src/app_settings.rs | 10 ++++++---- src-tauri/src/dream_runner.rs | 2 +- 10 files changed, 7 insertions(+), 5 deletions(-) rename {src.old => oldscr}/dreamconfig.rs (100%) rename {src.old => oldscr}/dreams.rs (100%) rename {src.old => oldscr}/dreams/dendraclock.rs (100%) rename {src.old => oldscr}/dreams/monet.rs (100%) rename {src.old => oldscr}/dreams/solid_color.rs (100%) rename {src.old => oldscr}/dreamspinner.rs (100%) rename {src.old => oldscr}/lib.rs (100%) rename {src.old => oldscr}/main.rs (100%) diff --git a/src.old/dreamconfig.rs b/oldscr/dreamconfig.rs similarity index 100% rename from src.old/dreamconfig.rs rename to oldscr/dreamconfig.rs diff --git a/src.old/dreams.rs b/oldscr/dreams.rs similarity index 100% rename from src.old/dreams.rs rename to oldscr/dreams.rs diff --git a/src.old/dreams/dendraclock.rs b/oldscr/dreams/dendraclock.rs similarity index 100% rename from src.old/dreams/dendraclock.rs rename to oldscr/dreams/dendraclock.rs diff --git a/src.old/dreams/monet.rs b/oldscr/dreams/monet.rs similarity index 100% rename from src.old/dreams/monet.rs rename to oldscr/dreams/monet.rs diff --git a/src.old/dreams/solid_color.rs b/oldscr/dreams/solid_color.rs similarity index 100% rename from src.old/dreams/solid_color.rs rename to oldscr/dreams/solid_color.rs diff --git a/src.old/dreamspinner.rs b/oldscr/dreamspinner.rs similarity index 100% rename from src.old/dreamspinner.rs rename to oldscr/dreamspinner.rs diff --git a/src.old/lib.rs b/oldscr/lib.rs similarity index 100% rename from src.old/lib.rs rename to oldscr/lib.rs diff --git a/src.old/main.rs b/oldscr/main.rs similarity index 100% rename from src.old/main.rs rename to oldscr/main.rs diff --git a/src-tauri/src/app_settings.rs b/src-tauri/src/app_settings.rs index 0c9a2eb..a70f187 100644 --- a/src-tauri/src/app_settings.rs +++ b/src-tauri/src/app_settings.rs @@ -1,3 +1,5 @@ +#![allow(dead_code)] + use anyhow::{anyhow, Result}; use directories::ProjectDirs; use log::{self, info}; @@ -97,9 +99,9 @@ impl SettingsRaw { if settings_file.is_file() { return Ok(settings_file); } - std::fs::create_dir_all(&settings_dir)?; + std::fs::create_dir_all(settings_dir)?; File::create(&settings_file)?; - return Ok(settings_file); + Ok(settings_file) } } @@ -142,7 +144,7 @@ impl Color { Ok(Color::new_with_alpha(r, g, b, a)) } - pub fn to_hex(&self) -> String { + pub fn as_hex(&self) -> String { format!("#{:02X}{:02X}{:02X}{:02X}", self.r, self.g, self.b, self.a) } } @@ -230,7 +232,7 @@ impl ColorScheme { } pub fn read_default_schemes() -> BTreeMap { let color_scheme_json = include_str!("../assets/color_scheme_data.json"); - let color_schemes: Vec = serde_json::from_str(&color_scheme_json).unwrap(); + let color_schemes: Vec = serde_json::from_str(color_scheme_json).unwrap(); let mut color_schemes_map: BTreeMap = BTreeMap::new(); for cs_t in color_schemes.into_iter() { let color_scheme = ColorScheme::from_color_scheme_text(cs_t); diff --git a/src-tauri/src/dream_runner.rs b/src-tauri/src/dream_runner.rs index fd2a63f..e5966dd 100644 --- a/src-tauri/src/dream_runner.rs +++ b/src-tauri/src/dream_runner.rs @@ -66,6 +66,6 @@ fn compare_monitors(a: &tauri::window::Monitor, b: &tauri::window::Monitor) -> b fn calculate_window_position(monitor: &tauri::window::Monitor) -> (f64, f64) { let (x, y) = (monitor.position().x as f64, monitor.position().y as f64); - let scale = monitor.scale_factor() as f64; + let scale = monitor.scale_factor(); (x / scale, y / scale) }