From 160489454d5ebd3503cf0b6aa2b5957a3f7399c0 Mon Sep 17 00:00:00 2001 From: chip Date: Fri, 26 May 2023 09:24:23 +0200 Subject: [PATCH] fix clippy errors on macOS (#7064) * fix clippy errors on macOS * cargo clippy --fix --- core/tauri-utils/src/config.rs | 2 +- core/tauri/src/vibrancy/macos.rs | 23 +++++++++++------------ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/core/tauri-utils/src/config.rs b/core/tauri-utils/src/config.rs index 3902372bc..6a73961af 100644 --- a/core/tauri-utils/src/config.rs +++ b/core/tauri-utils/src/config.rs @@ -748,7 +748,7 @@ pub struct BundleConfig { } /// a tuple struct of RGBA colors. Each value has minimum of 0 and maximum of 255. -#[derive(Debug, PartialEq, Clone, Deserialize, Serialize, Default)] +#[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize, Default)] #[cfg_attr(feature = "schema", derive(JsonSchema))] #[serde(rename_all = "camelCase", deny_unknown_fields)] pub struct Color(pub u8, pub u8, pub u8, pub u8); diff --git a/core/tauri/src/vibrancy/macos.rs b/core/tauri/src/vibrancy/macos.rs index c60476938..2b660f161 100644 --- a/core/tauri/src/vibrancy/macos.rs +++ b/core/tauri/src/vibrancy/macos.rs @@ -63,9 +63,11 @@ pub fn apply_effects(window: id, effects: WindowEffectsConfig) { return; } - if appearance as u32 > 9 && NSAppKitVersionNumber < NSAppKitVersionNumber10_14 { + if appearance as u32 > 4 && NSAppKitVersionNumber < NSAppKitVersionNumber10_11 { appearance = NSVisualEffectMaterial::AppearanceBased; - } else if appearance as u32 > 4 && NSAppKitVersionNumber < NSAppKitVersionNumber10_11 { + } + + if appearance as u32 > 9 && NSAppKitVersionNumber < NSAppKitVersionNumber10_14 { appearance = NSVisualEffectMaterial::AppearanceBased; } @@ -201,20 +203,17 @@ impl NSVisualEffectView for id { /// #[repr(u64)] -#[derive(Clone, Copy, Debug, PartialEq)] +#[derive(Clone, Copy, Debug, PartialEq, Eq)] pub enum NSVisualEffectMaterial { - #[deprecated( - since = "macOS 10.14", - note = "A default material appropriate for the view's effectiveAppearance. You should instead choose an appropriate semantic material." - )] + #[deprecated = "Since macOS 10.14 a default material appropriate for the view's effectiveAppearance. You should instead choose an appropriate semantic material."] AppearanceBased = 0, - #[deprecated(since = "macOS 10.14", note = "Use a semantic material instead.")] + #[deprecated = "Since macOS 10.14 use a semantic material instead."] Light = 1, - #[deprecated(since = "macOS 10.14", note = "Use a semantic material instead.")] + #[deprecated = "Since macOS 10.14 use a semantic material instead."] Dark = 2, - #[deprecated(since = "macOS 10.14", note = "Use a semantic material instead.")] + #[deprecated = "Since macOS 10.14 use a semantic material instead."] MediumLight = 8, - #[deprecated(since = "macOS 10.14", note = "Use a semantic material instead.")] + #[deprecated = "Since macOS 10.14 use a semantic material instead."] UltraDark = 9, /// macOS 10.10+ @@ -252,7 +251,7 @@ pub enum NSVisualEffectMaterial { /// #[allow(dead_code)] #[repr(u64)] -#[derive(Clone, Copy, Debug, PartialEq)] +#[derive(Clone, Copy, Debug, PartialEq, Eq)] pub enum NSVisualEffectState { /// Make window vibrancy state follow the window's active state FollowsWindowActiveState = 0,