From 61c17d2e24e074cd592358fe3652f37119aa9f1e Mon Sep 17 00:00:00 2001 From: Psychotoxical Date: Sun, 19 Apr 2026 13:56:16 +0200 Subject: [PATCH] chore(warnings): silence cpal lifetime + unused tray import on Windows - patches/cpal-0.15.3 wasapi device.rs: annotate MutexGuard return with '_ so mismatched_lifetime_syntaxes stops firing. - lib.rs: gate the MouseButtonState import to non-Windows targets (the Windows tray uses DoubleClick and never pattern-matches it). Cosmetic only, no behavioural change. Co-Authored-By: Claude Opus 4.7 (1M context) --- src-tauri/patches/cpal-0.15.3/src/host/wasapi/device.rs | 2 +- src-tauri/src/lib.rs | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src-tauri/patches/cpal-0.15.3/src/host/wasapi/device.rs b/src-tauri/patches/cpal-0.15.3/src/host/wasapi/device.rs index 983c8c5f..828f4d8d 100644 --- a/src-tauri/patches/cpal-0.15.3/src/host/wasapi/device.rs +++ b/src-tauri/patches/cpal-0.15.3/src/host/wasapi/device.rs @@ -342,7 +342,7 @@ impl Device { /// Ensures that `future_audio_client` contains a `Some` and returns a locked mutex to it. fn ensure_future_audio_client( &self, - ) -> Result>, windows::core::Error> { + ) -> Result>, windows::core::Error> { let mut lock = self.future_audio_client.lock().unwrap(); if lock.is_some() { return Ok(lock); diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index 34fee686..7dade6da 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -13,9 +13,13 @@ use std::sync::atomic::{AtomicBool, Ordering}; use tauri::{ menu::{MenuBuilder, MenuItemBuilder, PredefinedMenuItem}, - tray::{MouseButton, MouseButtonState, TrayIcon, TrayIconBuilder, TrayIconEvent}, + tray::{MouseButton, TrayIcon, TrayIconBuilder, TrayIconEvent}, Emitter, Manager, }; +// MouseButtonState is only matched on non-Windows targets — on Windows the +// tray uses DoubleClick which doesn't carry a button_state. +#[cfg(not(target_os = "windows"))] +use tauri::tray::MouseButtonState; /// Tracks which user-configured shortcuts are currently registered (shortcut_str → action). /// Prevents on_shortcut() accumulating duplicate handlers across JS reloads (HMR / StrictMode).