github/portmaster
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[WIP] Fix cargo clippy lint build

Browse Source
This commit is contained in:
Vladimir Stoilov
2024-09-30 18:48:38 +03:00
parent a452f0cbf6
commit 3411e08500
6 changed files with 12 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
desktop/tauri/src-tauri/src/config.rs
View File

@@ -16,7 +16,7 @@ pub struct Config {
pub theme: Theme,
}
const CONFIG_FILE_NAME: &'static str = "config.json";
const CONFIG_FILE_NAME: &str = "config.json";
pub fn save(app: &AppHandle, config: Config) -> tauri::Result<()> {
let config_dir = app.path().app_config_dir()?;

7
desktop/tauri/src-tauri/src/traymenu.rs
View File

@@ -59,7 +59,7 @@ fn get_theme_mode() -> dark_light::Mode {
if let Ok(value) = USER_THEME.read() {
return *value.deref();
}
return dark_light::detect();
dark_light::detect()
}
fn get_green_icon() -> &'static [u8] {
@@ -88,8 +88,7 @@ fn get_blue_icon() -> &'static [u8] {
fn get_red_icon() -> &'static [u8] {
const LIGHT_RED_ICON: &[u8] =
include_bytes!("../../../../assets/data/icons/pm_light_red_64.png");
const DARK_RED_ICON: &'static [u8] =
include_bytes!("../../../../assets/data/icons/pm_dark_red_64.png");
const DARK_RED_ICON: &[u8] = include_bytes!("../../../../assets/data/icons/pm_dark_red_64.png");
match get_theme_mode() {
dark_light::Mode::Light => DARK_RED_ICON,
_ => LIGHT_RED_ICON,
@@ -421,7 +420,7 @@ pub async fn tray_handler(cli: PortAPI, app: tauri::AppHandle) {
match payload.parse::<SPNStatus>() {
Ok(value) => {
debug!("SPN status update: {}", value.status);
spn_status = value.status.clone();
spn_status.clone_from(&value.status);
update_icon(icon.clone(), app.menu(), subsystems.clone(), spn_status.clone());
},

2
desktop/tauri/src-tauri/src/window.rs
View File

@@ -98,7 +98,7 @@ pub fn hide_splash_window(app: &AppHandle) -> Result<()> {
if let Some(window) = app.get_webview_window("splash") {
return window.hide();
}
return Err(tauri::Error::WindowNotFound);
Err(tauri::Error::WindowNotFound)
}
pub fn set_window_icon(window: &WebviewWindow) {