fix: cargo clippy

B0ney · Jan 10, 2024 · 86dceac · 86dceac
1 parent e92f319
commit 86dceac
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 29 deletions.
diff --git a/src/app.rs b/src/app.rs
@@ -407,14 +407,11 @@ impl multi_window::Application for XMODITS {
                 );
             }
             Message::SaveErrorsResult(result) => {
-                match result {
-                    Ok(path) => {
-                        tracing::info!("Successfully saved errors to: {}", &path.display());
-                        if self.general_cfg.show_errors_in_text_editor {
-                            let _ = open::that_detached(path);
-                        }
+                if let Ok(path) = result {
+                    tracing::info!("Successfully saved errors to: {}", &path.display());
+                    if self.general_cfg.show_errors_in_text_editor {
+                        let _ = open::that_detached(path);
                     }
-                    _ => (), // todo
                 }
             }
             Message::StartRipping => {
@@ -440,19 +437,18 @@ impl multi_window::Application for XMODITS {
                     true => self.file_hovered = true,
                     false => self.sample_player.set_hovered(id, true),
                 },
-                event::Event::FileDropped(id, file) => match id == window::Id::MAIN {
-                    true => {
+                event::Event::FileDropped(id, file) => {
+                    if id == window::Id::MAIN {
                         self.add_entry(file);
                         self.file_hovered = false;
-                    }
-                    false => {
+                    } else {
                         self.sample_player.set_hovered(id, false);
                         return self
                             .sample_player
                             .load_samples(id, file)
                             .map(Message::SamplePlayer);
                     }
-                },
+                }
                 event::Event::Save => return self.save_cfg(),
                 event::Event::Start => return self.start_ripping(),
             },
@@ -485,11 +481,12 @@ impl multi_window::Application for XMODITS {
         Command::none()
     }
 
-    fn view(&self, id: window::Id) -> Element<Message> {
-        if id > window::Id::MAIN {
+    fn view(&self, _id: window::Id) -> Element<Message> {
+        #[cfg(feature = "audio")]
+        if _id > window::Id::MAIN {
             return self
                 .sample_player
-                .view(id, &self.entries)
+                .view(_id, &self.entries)
                 .map(Message::SamplePlayer);
         }
 
@@ -605,7 +602,7 @@ impl multi_window::Application for XMODITS {
                 state,
                 time,
                 destination,
-            } => main_panel::view_finished(state, time, self.file_hovered, &destination),
+            } => main_panel::view_finished(state, time, self.file_hovered, destination),
         };
 
         let allow_warnings = !self.general_cfg.suppress_warnings;

diff --git a/src/cli.rs b/src/cli.rs
@@ -40,7 +40,7 @@ pub fn parse(args: Vec<String>) -> Mode {
     }
 
     #[cfg(windows)]
-    if args.len() > 0 {
+    if !args.is_empty() {
         return Mode::DragNDrop(args);
     }
 

diff --git a/src/screen/sample_player.rs b/src/screen/sample_player.rs
@@ -24,9 +24,6 @@ pub mod preview_manager_dummy {
         pub fn update(&mut self, _msg: Message, _entries: &mut Entries) -> Command<Message> {
             Command::none()
         }
-        pub fn view(&self, _id: Id, _entries: &Entries) -> Element<Message> {
-            unimplemented!("Attempt to view sample player without 'audio' feature")
-        }
         pub fn load_samples(&self, _id: Id, _path: PathBuf) -> Command<Message> {
             Command::none()
         }

diff --git a/src/screen/sample_player/instance.rs b/src/screen/sample_player/instance.rs
@@ -208,7 +208,7 @@ impl Instance {
         let load = |state: &mut State, path: PathBuf| {
             *state = State::Loading;
             self.player.stop();
-            return load_samples(path);
+            load_samples(path)
         };
 
         match &self.state {

diff --git a/src/screen/sample_player/instance/sample.rs b/src/screen/sample_player/instance/sample.rs
@@ -6,7 +6,7 @@ use crate::icon;
 use crate::theme;
 use crate::widget::helpers::centered_container;
 use crate::widget::waveform_view::WaveData;
-use crate::widget::{Button, Collection, Container, Element, Row};
+use crate::widget::{Collection, Element};
 
 use audio_engine;
 

diff --git a/src/widget/waveform_view.rs b/src/widget/waveform_view.rs
@@ -230,13 +230,6 @@ impl State {
     fn reset_zoom(&mut self) {
         self.zoom = 1.0;
     }
-
-    fn bounds_check_offset(&mut self, wave: &WaveData) {
-        let wave_len = (wave.peaks()[0].len() as f32 * self.zoom) as usize;
-        if self.wave_offset > wave_len {
-            self.wave_offset = wave_len.saturating_sub(1);
-        }
-    }
 
     fn update_zoom(&mut self, wave: &WaveData) {
         self.zoom = self.zoom.clamp(MIN_SCALE, MAX_SCALE);