Clean up + clippy + cargo fmt

Author: ItsEeleeya

apps/desktop/src-tauri/src/platform/macos/mod.rs

@@ -1,11 +1,7 @@
 mod sc_shareable_content;
 
-use block2::RcBlock;
 use objc2::{msg_send, sel};
-use objc2_foundation::NSObjectProtocol;
-use objc2_web_kit::WKWebView;
 pub use sc_shareable_content::*;
-use tauri::WebviewWindow;
 
 pub fn set_window_level(window: tauri::Window, level: objc2_app_kit::NSWindowLevel) {
     let c_window = window.clone();
@@ -382,29 +378,3 @@ unsafe fn force_glass_view_always_active(glass_view: cocoa::base::id) {
         }
     }
 }
-
-// pub fn get_ns_window_number(ns_window: *mut c_void) -> isize {
-//     let ns_window = ns_window as *const objc2_app_kit::NSWindow;
-
-//     unsafe { (*ns_window).windowNumber() }
-// }
-
-// #[link(name = "CoreGraphics", kind = "framework")]
-// unsafe extern "C" {
-//     pub fn CGRectMakeWithDictionaryRepresentation(
-//         dict: CFDictionaryRef,
-//         rect: *mut CGRect,
-//     ) -> boolean_t;
-// }
-
-// /// Makes the background of the WKWebView layer transparent.
-// /// This differs from Tauri's implementation as it does not change the window background which causes performance performance issues and artifacts when shadows are enabled on the window.
-// /// Use Tauri's implementation to make the window itself transparent.
-// pub fn make_webview_transparent(target: &tauri::WebviewWindow) -> tauri::Result<()> {
-//     target.with_webview(|webview| unsafe {
-//         let wkwebview = webview.inner() as id;
-//         let no: id = msg_send![class!(NSNumber), numberWithBool:0];
-//         // [https://developer.apple.com/documentation/webkit/webview/1408486-drawsbackground]
-//         let _: id = msg_send![wkwebview, setValue:no forKey: NSString::alloc(nil).init_str("drawsBackground")];
-//     })
-// }

apps/desktop/src-tauri/src/windows.rs

@@ -694,24 +694,6 @@ impl CapWindowId {
         )
     }
 
-    pub fn is_transparent(&self) -> bool {
-        if matches!(self, Self::Settings) {
-            return cfg!(target_os = "macos");
-        }
-
-        matches!(
-            self,
-            Self::Main
-                | Self::Onboarding
-                | Self::Camera
-                | Self::WindowCaptureOccluder { .. }
-                | Self::CaptureArea
-                | Self::RecordingControls
-                | Self::RecordingsOverlay
-                | Self::TargetSelectOverlay { .. }
-        )
-    }
-
     pub fn get(&self, app: &AppHandle<Wry>) -> Option<WebviewWindow> {
         if matches!(self, Self::Camera) {
             return current_camera_window(app);
@@ -1230,7 +1212,7 @@ impl CapWindow {
                 let should_protect = should_protect_window(app, &title);
 
                 #[cfg(target_os = "macos")]
-                let panel_activation_guard = permissions::prepare_macos_panel_window(app);
+                let _panel_activation_guard = permissions::prepare_macos_panel_window(app);
 
                 let window = self
                     .window_builder(app, "/")
@@ -2114,7 +2096,7 @@ impl CapWindow {
                     app.run_on_main_thread({
                         let window = window.clone();
                         let app = app.clone();
-                        let panel_activation_guard = panel_activation_guard;
+                        let _panel_activation_guard = panel_activation_guard;
                         move || {
                             use tauri_nspanel::cocoa::appkit::{NSWindowCollectionBehavior, NSWindowStyleMask};
                             use tauri_nspanel::panel_delegate;
@@ -2496,7 +2478,6 @@ pub async fn apply_macos_liquid_glass_background(
     }
 }
 
-
 #[specta::specta]
 #[tauri::command(async)]
 #[instrument(skip(_window))]

crates/recording/src/output_pipeline/core.rs

@@ -1858,8 +1858,7 @@ fn spawn_video_encoder<TMutex: VideoMuxer<VideoFrame = TVideo::Frame>, TVideo: V
                         Ok(d) => d,
                         Err(TimestampAnomalyError::TooManyConsecutiveAnomalies { count }) => {
                             return Err(anyhow!(
-                                "Video stream timestamp anomaly: {} consecutive anomalies exceeded threshold",
-                                count
+                                "Video stream timestamp anomaly: {count} consecutive anomalies exceeded threshold"
                             ));
                         }
                     };

crates/recording/src/output_pipeline/macos.rs

@@ -291,9 +291,7 @@ impl Muxer for AVFoundationMp4Muxer {
             info!(available_mb, "Disk space check before recording start");
             if available_mb < DISK_SPACE_MIN_START_MB {
                 return Err(anyhow!(
-                    "Insufficient disk space to start recording: {}MB available, {}MB required",
-                    available_mb,
-                    DISK_SPACE_MIN_START_MB
+                    "Insufficient disk space to start recording: {available_mb}MB available, {DISK_SPACE_MIN_START_MB}MB required"
                 ));
             }
         }

crates/recording/src/screenshot.rs

@@ -1166,11 +1166,7 @@ fn convert_ffmpeg_frame_to_image(frame: &ffmpeg::frame::Video) -> anyhow::Result
 
     if src_stride < dst_stride {
         return Err(anyhow!(
-            "Source stride ({}) is less than destination stride ({}); width={}, height={}",
-            src_stride,
-            dst_stride,
-            width,
-            height
+            "Source stride ({src_stride}) is less than destination stride ({dst_stride}); width={width}, height={height}"
         ));
     }
 

crates/recording/src/sources/screen_capture/macos.rs

@@ -745,8 +745,7 @@ impl output_pipeline::VideoSource for VideoSource {
                                         "Failed to restart macOS screen capture"
                                     );
                                     return Err(anyhow!(
-                                        "Screen capture restart failed after {} attempts: {e}",
-                                        restart_count
+                                        "Screen capture restart failed after {restart_count} attempts: {e}"
                                     ));
                                 }
                             }

crates/recording/src/studio_recording.rs

@@ -1651,7 +1651,7 @@ fn write_in_progress_meta(recording_dir: &Path) -> anyhow::Result<()> {
     };
 
     meta.save_for_project()
-        .map_err(|e| anyhow!("Failed to save in-progress meta: {:?}", e))
+        .map_err(|e| anyhow!("Failed to save in-progress meta: {e}"))
 }
 
 #[cfg(test)]