Cleanup Rust warnings + edition 2024 & enable lints on all crates (#858)

* `clippy --fix`

* `cargo fmt --all`

* edition 2024 on all crates

* drop `rust-version` from `cap-media`

* drop `editor` dep from `cap-cli` (probs was intended to be `cap-editor`)

* some fixes

* more clippy fixes

* `cargo fmt --all`

* more clippy fixes

* more Clippy fixes

* enable lints for all crates + more fixes

* more clippy errors

* comment out unused stuff

* more fixes

* more fixes

* fix more clippy warning

* fix more warnings

* format

* use `Into` for `Hotkey` to `Shortcut`

* done

* fix Rust lints from today's release

* format

* Windows cleanup

* Windows cleanup

* windows fixes

* wip

* fix

* fix

* cleanup more

* more windows warnings

* more stuff

* fix

* cleanup

* final fixes

* fix Cap lib target

* nope nerd

Author: oscartbeaumont

Cargo.lock

@@ -59,6 +59,11 @@ windows-sys = "0.59.0"
 windows-capture = "1.5.0"
 percent-encoding = "2.3.1"
 
+# TODO: Reenable these: https://github.com/CapSoftware/Cap/issues/859
+[workspace.lints.rust]
+deprecated = "allow"
+unexpected_cfgs = "allow"
+
 [workspace.lints.clippy]
 dbg_macro = "deny"
 let_underscore_future = "deny"

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "cap"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 clap = { version = "4.5.23", features = ["derive"] }
@@ -17,10 +17,12 @@ cap-camera = { path = "../../crates/camera" }
 serde = { workspace = true }
 serde_json = "1.0.133"
 tokio.workspace = true
-editor = "0.1.1"
 scap.workspace = true
 uuid = { version = "1.11.1", features = ["v4"] }
 ffmpeg = { workspace = true }
 tracing.workspace = true
 tracing-subscriber = "0.3.19"
 flume.workspace = true
+
+[lints]
+workspace = true

apps/cli/Cargo.toml

@@ -1,7 +1,7 @@
 mod record;
 
 use std::{
-    io::{stdout, Write},
+    io::{Write, stdout},
     path::PathBuf,
 };
 
@@ -143,7 +143,6 @@ window {}:
             None => {
                 args.run().await?;
             }
-            _ => {}
         },
     }
 
@@ -161,7 +160,7 @@ impl Export {
         let exporter_base = ExporterBase::builder(self.project_path)
             .build()
             .await
-            .map_err(|v| format!("Exporter build error: {}", v.to_string()))?;
+            .map_err(|v| format!("Exporter build error: {v}"))?;
 
         let mut stdout = stdout();
 
@@ -170,13 +169,13 @@ impl Export {
             resolution_base: XY::new(1920, 1080),
             compression: cap_export::mp4::ExportCompression::Minimal,
         }
-        .export(exporter_base, move |f| {
+        .export(exporter_base, move |_f| {
             // print!("\rrendered frame {f}");
 
             stdout.flush().unwrap();
         })
         .await
-        .map_err(|v| format!("Exporter error: {}", v.to_string()))?;
+        .map_err(|v| format!("Exporter error: {v}"))?;
 
         let output_path = if let Some(output_path) = self.output_path {
             std::fs::copy(&exporter_output_path, &output_path).unwrap();

apps/cli/src/main.rs

@@ -1,7 +1,7 @@
 use std::{env::current_dir, path::PathBuf, sync::Arc};
 
 use cap_camera::ModelID;
-use cap_media::{feeds::CameraFeed, sources::ScreenCaptureTarget};
+use cap_media::sources::ScreenCaptureTarget;
 use clap::Args;
 use tokio::{io::AsyncBufReadExt, sync::Mutex};
 use uuid::Uuid;
@@ -44,7 +44,7 @@ impl RecordStart {
         }?;
 
         let camera = if let Some(model_id) = self.camera {
-            let model_id: ModelID = model_id
+            let _model_id: ModelID = model_id
                 .try_into()
                 .map_err(|_| "Invalid model ID".to_string())?;
 

apps/cli/src/record.rs

@@ -9,7 +9,7 @@ edition = "2024"
 workspace = true
 
 [lib]
-name = "cap_desktop"
+name = "cap_desktop_lib"
 crate-type = ["lib", "cdylib", "staticlib"]
 
 [build-dependencies]

apps/desktop/src-tauri/Cargo.toml

@@ -53,19 +53,15 @@ impl VolumeMeter {
         self.maxes.push(time, value);
         self.times.push_back(time);
 
-        loop {
-            if let Some(time) = self
-                .times
-                .back()
-                .unwrap()
-                .duration_since(self.times.front().unwrap())
-            {
-                if time > self.keep_duration {
-                    self.maxes.remove(self.times.front().unwrap());
-                    self.times.pop_front();
-                } else {
-                    break;
-                }
+        while let Some(time) = self
+            .times
+            .back()
+            .unwrap()
+            .duration_since(self.times.front().unwrap())
+        {
+            if time > self.keep_duration {
+                self.maxes.remove(self.times.front().unwrap());
+                self.times.pop_front();
             } else {
                 break;
             }
@@ -86,6 +82,7 @@ struct MinNonNan(f64);
 
 impl Eq for MinNonNan {}
 
+#[allow(clippy::non_canonical_partial_ord_impl)]
 impl PartialOrd for MinNonNan {
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
         other.0.partial_cmp(&self.0)

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

@@ -57,10 +57,10 @@ impl AuthStore {
             return Err("User not authenticated".to_string());
         };
 
-        if let Some(plan) = &auth.plan {
-            if plan.manual {
-                return Ok(());
-            }
+        if let Some(plan) = &auth.plan
+            && plan.manual
+        {
+            return Ok(());
         }
 
         let mut auth = auth;
@@ -72,7 +72,7 @@ impl AuthStore {
             .authed_api_request("/api/desktop/plan", |client, url| client.get(url))
             .await
             .map_err(|e| {
-                println!("Failed to fetch plan: {}", e);
+                println!("Failed to fetch plan: {e}");
                 e.to_string()
             })?;
         println!("Plan fetch response status: {}", response.status());
@@ -93,7 +93,7 @@ impl AuthStore {
         auth.plan = Some(Plan {
             upgraded: plan_response.upgraded,
             last_checked: chrono::Utc::now().timestamp() as i32,
-            manual: auth.plan.as_ref().map_or(false, |p| p.manual),
+            manual: auth.plan.as_ref().is_some_and(|p| p.manual),
         });
         auth.intercom_hash = Some(plan_response.intercom_hash.unwrap_or_default());
 

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

@@ -56,6 +56,7 @@ pub struct CameraWindowState {
 }
 
 pub struct CameraPreview {
+    #[allow(clippy::type_complexity)]
     reconfigure: (
         broadcast::Sender<Option<(u32, u32)>>,
         broadcast::Receiver<Option<(u32, u32)>>,
@@ -205,13 +206,13 @@ impl CameraPreview {
                     let output_height = (1280.0 / camera_aspect_ratio) as u32;
 
                     let new_texture_value = if let Some(frame) = frame {
-                        if loading == true {
+                        if loading {
                             loading_state.store(false, Ordering::Relaxed);
                             loading = false;
                         }
 
                         let resampler_frame = resampler_frame
-                            .get_or_init((output_width, output_height), || frame::Video::empty());
+                            .get_or_init((output_width, output_height), frame::Video::empty);
 
                         scaler.cached(
                             frame.format(),
@@ -268,7 +269,7 @@ impl CameraPreview {
 
     /// Save the current state of the camera window.
     pub fn save(&self, state: &CameraWindowState) -> tauri_plugin_store::Result<()> {
-        self.store.set("state", serde_json::to_value(&state)?);
+        self.store.set("state", serde_json::to_value(state)?);
         self.store.save()?;
         self.reconfigure.0.send(None).ok();
         Ok(())
@@ -509,11 +510,6 @@ impl Renderer {
             .contains(&CompositeAlphaMode::PostMultiplied)
         {
             CompositeAlphaMode::PostMultiplied
-        } else if surface_capabilities
-            .alpha_modes
-            .contains(&CompositeAlphaMode::PostMultiplied)
-        {
-            CompositeAlphaMode::PostMultiplied
         } else {
             CompositeAlphaMode::Inherit
         };
@@ -598,7 +594,7 @@ impl Renderer {
             _,
         ) = if let Some(monitor) = self.window.current_monitor()? {
             let size = monitor.position().to_logical(monitor.scale_factor());
-            (monitor.size().clone(), size, monitor.scale_factor())
+            (*monitor.size(), size, monitor.scale_factor())
         } else {
             (PhysicalSize::new(640, 360), LogicalPosition::new(0, 0), 1.0)
         };
@@ -701,8 +697,8 @@ impl Renderer {
             .texture
             .create_view(&wgpu::TextureViewDescriptor::default());
 
-        let surface_width = surface.texture.width();
-        let surface_height = surface.texture.height();
+        // let surface_width = surface.texture.width();
+        // let surface_height = surface.texture.height();
 
         let mut encoder = self
             .device
@@ -775,7 +771,7 @@ impl Renderer {
                         origin: wgpu::Origin3d::ZERO,
                         aspect: wgpu::TextureAspect::All,
                     },
-                    &buffer,
+                    buffer,
                     wgpu::TexelCopyBufferLayout {
                         offset: 0,
                         bytes_per_row: Some(stride),
@@ -823,7 +819,7 @@ impl<K, V> Default for Cached<K, V> {
 }
 
 impl<K: PartialEq, V> Cached<K, V> {
-    pub fn get_or_init<'a>(&'a mut self, key: K, init: impl FnOnce() -> V) -> &'a mut V {
+    pub fn get_or_init(&mut self, key: K, init: impl FnOnce() -> V) -> &mut V {
         if self.value.as_ref().is_none_or(|(k, _)| *k != key) {
             self.value = Some((key, init()));
         }