From 69bc8e69fd5b28ca0a9284b0139aa78f0dbfdf86 Mon Sep 17 00:00:00 2001 From: unspeaker Date: Thu, 19 Dec 2024 17:51:47 +0100 Subject: [PATCH] autofix ~200 warnings --- crates/tek/src/audio.rs | 4 ++-- crates/tek/src/jack.rs | 5 ++--- crates/tek/src/lib.rs | 4 ++-- crates/tek/src/space.rs | 10 +++++----- crates/tek/src/space/stack.rs | 4 ++-- crates/tek/src/time/unit.rs | 1 - crates/tek/src/tui.rs | 7 +++---- crates/tek/src/tui/app_groovebox.rs | 1 - crates/tek/src/tui/app_sequencer.rs | 2 +- crates/tek/src/tui/arranger_clip.rs | 2 +- crates/tek/src/tui/arranger_scene.rs | 2 +- crates/tek/src/tui/arranger_track.rs | 2 +- crates/tek/src/tui/file_browser.rs | 3 --- crates/tek/src/tui/phrase_list.rs | 2 +- 14 files changed, 21 insertions(+), 28 deletions(-) diff --git a/crates/tek/src/audio.rs b/crates/tek/src/audio.rs index 46aa0557..a44f6276 100644 --- a/crates/tek/src/audio.rs +++ b/crates/tek/src/audio.rs @@ -1,3 +1,3 @@ -pub(crate) mod audio_in; pub(crate) use audio_in::*; -pub(crate) mod audio_out; pub(crate) use audio_out::*; +pub(crate) mod audio_in; +pub(crate) mod audio_out; pub(crate) mod sampler; pub(crate) use sampler::*; diff --git a/crates/tek/src/jack.rs b/crates/tek/src/jack.rs index aabea352..44332681 100644 --- a/crates/tek/src/jack.rs +++ b/crates/tek/src/jack.rs @@ -1,9 +1,8 @@ -use crate::*; -pub(crate) mod activate; pub(crate) use self::activate::*; +pub(crate) mod activate; pub(crate) mod audio; pub(crate) use self::audio::*; pub(crate) mod client; pub(crate) use self::client::*; -pub(crate) mod from_jack; pub(crate) use self::from_jack::*; +pub(crate) mod from_jack; pub(crate) mod jack_event; pub(crate) use self::jack_event::*; pub(crate) mod ports; pub(crate) use self::ports::*; diff --git a/crates/tek/src/lib.rs b/crates/tek/src/lib.rs index abe73129..a13ac2f9 100644 --- a/crates/tek/src/lib.rs +++ b/crates/tek/src/lib.rs @@ -2,7 +2,7 @@ pub mod core; pub(crate) use self::core::*; pub mod time; pub(crate) use self::time::*; pub mod space; pub(crate) use self::space::*; pub mod tui; pub(crate) use self::tui::*; -pub mod edn; pub(crate) use self::edn::*; +pub mod edn; pub mod jack; pub(crate) use self::jack::*; pub mod midi; pub(crate) use self::midi::*; pub mod audio; pub(crate) use self::audio::*; @@ -71,7 +71,7 @@ pub(crate) use ::jack::{ Client, AsyncClient, ClientOptions, ClientStatus, ProcessScope, Control, CycleTimes, Port, PortId, - PortSpec, MidiIn, MidiOut, AudioIn, AudioOut, Unowned, + PortSpec, MidiIn, MidiOut, AudioOut, Unowned, Transport, TransportState, MidiIter, RawMidi, Frames, NotificationHandler, diff --git a/crates/tek/src/space.rs b/crates/tek/src/space.rs index bdad4973..1934f727 100644 --- a/crates/tek/src/space.rs +++ b/crates/tek/src/space.rs @@ -8,17 +8,17 @@ pub(crate) mod direction; pub(crate) use direction::*; ////////////////////////////////////////////////////// -pub(crate) mod align; pub(crate) use align::*; -pub(crate) mod bsp; pub(crate) use bsp::*; -pub(crate) mod cond; pub(crate) use cond::*; -pub(crate) mod fill; pub(crate) use fill::*; +pub(crate) mod align; +pub(crate) mod bsp; +pub(crate) mod cond; +pub(crate) mod fill; pub(crate) mod fixed; pub(crate) use fixed::*; pub(crate) mod inset_outset; pub(crate) use inset_outset::*; pub(crate) mod layers; pub(crate) use layers::*; pub(crate) mod measure; pub(crate) use measure::*; pub(crate) mod min_max; pub(crate) use min_max::*; pub(crate) mod push_pull; pub(crate) use push_pull::*; -pub(crate) mod scroll; pub(crate) use scroll::*; +pub(crate) mod scroll; pub(crate) mod shrink_grow; pub(crate) use shrink_grow::*; pub(crate) mod split; pub(crate) use split::*; pub(crate) mod stack; pub(crate) use stack::*; diff --git a/crates/tek/src/space/stack.rs b/crates/tek/src/space/stack.rs index 24daf4be..914217d9 100644 --- a/crates/tek/src/space/stack.rs +++ b/crates/tek/src/space/stack.rs @@ -130,8 +130,8 @@ where }, Direction::Left => { - let mut w: E::Unit = 0.into(); - let mut h: E::Unit = 0.into(); + let w: E::Unit = 0.into(); + let h: E::Unit = 0.into(); (self.0)(&mut |component: &dyn Render| { if w < to.w() { todo!(); diff --git a/crates/tek/src/time/unit.rs b/crates/tek/src/time/unit.rs index a0ad30e7..940cd65b 100644 --- a/crates/tek/src/time/unit.rs +++ b/crates/tek/src/time/unit.rs @@ -1,4 +1,3 @@ -use crate::*; /// A unit of time, represented as an atomic 64-bit float. /// diff --git a/crates/tek/src/tui.rs b/crates/tek/src/tui.rs index fcf1ba66..787d40e2 100644 --- a/crates/tek/src/tui.rs +++ b/crates/tek/src/tui.rs @@ -11,7 +11,6 @@ pub use tui_output::TuiOutput; //////////////////////////////////////////////////////// mod tui_style; -pub(crate) use tui_style::*; mod tui_theme; pub(crate) use tui_theme::*; mod tui_border; @@ -22,7 +21,7 @@ pub(crate) use tui_border::*; mod app_transport; pub(crate) use app_transport::*; mod app_sequencer; pub(crate) use app_sequencer::*; mod app_sampler; pub(crate) use app_sampler::*; -mod app_groovebox; pub(crate) use app_groovebox::*; +mod app_groovebox; mod app_arranger; pub(crate) use app_arranger::*; /////////////////////////////////////////////////////// @@ -31,7 +30,7 @@ mod arranger_clip; pub(crate) use arranger_clip::*; mod arranger_scene; pub(crate) use arranger_scene::*; mod arranger_select; pub(crate) use arranger_select::*; mod arranger_track; pub(crate) use arranger_track::*; -mod arranger_mode_h; pub(crate) use arranger_mode_h::*; +mod arranger_mode_h; mod arranger_mode_v; pub(crate) use arranger_mode_v::*; //////////////////////////////////////////////////////// @@ -43,7 +42,7 @@ mod piano_horizontal; pub(crate) use piano_horizontal::*; mod phrase_length; pub(crate) use phrase_length::*; mod phrase_rename; pub(crate) use phrase_rename::*; mod phrase_list; pub(crate) use phrase_list::*; -mod port_select; pub(crate) use port_select::*; +mod port_select; //////////////////////////////////////////////////////// diff --git a/crates/tek/src/tui/app_groovebox.rs b/crates/tek/src/tui/app_groovebox.rs index b07691ef..d565f33c 100644 --- a/crates/tek/src/tui/app_groovebox.rs +++ b/crates/tek/src/tui/app_groovebox.rs @@ -1,6 +1,5 @@ use crate::*; use super::*; -use KeyCode::Char; pub struct GrooveboxTui { pub sequencer: SequencerTui, pub sampler: SamplerTui, diff --git a/crates/tek/src/tui/app_sequencer.rs b/crates/tek/src/tui/app_sequencer.rs index 16b62cab..1bddb4eb 100644 --- a/crates/tek/src/tui/app_sequencer.rs +++ b/crates/tek/src/tui/app_sequencer.rs @@ -1,6 +1,6 @@ use crate::*; use ClockCommand::{Play, Pause}; -use KeyCode::{Tab, BackTab, Char}; +use KeyCode::{Tab, Char}; use SequencerCommand::*; use PhraseCommand::*; use PhrasePoolCommand::*; diff --git a/crates/tek/src/tui/arranger_clip.rs b/crates/tek/src/tui/arranger_clip.rs index 9f61d1f1..0a0019be 100644 --- a/crates/tek/src/tui/arranger_clip.rs +++ b/crates/tek/src/tui/arranger_clip.rs @@ -1,7 +1,7 @@ use crate::*; pub fn to_arranger_clip_command (input: &TuiInput, t: usize, len_t: usize, s: usize, len_s: usize) -> Option { - use KeyCode::{Char, Up, Down, Left, Right, Delete}; + use KeyCode::{Char, Delete}; use ArrangerCommand as Cmd; use ArrangerSelection as Select; use ArrangerClipCommand as Clip; diff --git a/crates/tek/src/tui/arranger_scene.rs b/crates/tek/src/tui/arranger_scene.rs index b04ff695..71df8055 100644 --- a/crates/tek/src/tui/arranger_scene.rs +++ b/crates/tek/src/tui/arranger_scene.rs @@ -74,7 +74,7 @@ pub enum ArrangerSceneCommand { SetColor(usize, ItemPalette), } pub fn to_arranger_scene_command (input: &TuiInput, s: usize, len: usize) -> Option { - use KeyCode::{Char, Up, Down, Right, Enter, Delete}; + use KeyCode::{Char, Delete}; use ArrangerCommand as Cmd; use ArrangerSelection as Select; use ArrangerSceneCommand as Scene; diff --git a/crates/tek/src/tui/arranger_track.rs b/crates/tek/src/tui/arranger_track.rs index 41dee088..6d49f9e7 100644 --- a/crates/tek/src/tui/arranger_track.rs +++ b/crates/tek/src/tui/arranger_track.rs @@ -1,5 +1,5 @@ use crate::*; -use KeyCode::{Char, Down, Left, Right, Delete}; +use KeyCode::{Char, Delete}; pub trait HasTracks: Send + Sync { fn tracks (&self) -> &Vec; diff --git a/crates/tek/src/tui/file_browser.rs b/crates/tek/src/tui/file_browser.rs index 2cd49187..9911058d 100644 --- a/crates/tek/src/tui/file_browser.rs +++ b/crates/tek/src/tui/file_browser.rs @@ -1,7 +1,4 @@ use crate::*; -use KeyCode::{Up, Down, Right, Left, Enter, Esc, Char, Backspace}; -use FileBrowserCommand::*; -use super::phrase_list::PhraseListMode::{Import, Export}; /// Browses for phrase to import/export #[derive(Debug, Clone)] pub struct FileBrowser { diff --git a/crates/tek/src/tui/phrase_list.rs b/crates/tek/src/tui/phrase_list.rs index 6de320af..21979c00 100644 --- a/crates/tek/src/tui/phrase_list.rs +++ b/crates/tek/src/tui/phrase_list.rs @@ -329,7 +329,7 @@ command!(|self: FileBrowserCommand, state: PhraseListModel|{ None }); input_to_command!(FileBrowserCommand:|state:PhraseListModel,from|{ - use PhraseListMode::*; + use FileBrowserCommand::*; use KeyCode::{Up, Down, Left, Right, Enter, Esc, Backspace, Char}; if let Some(PhraseListMode::Import(_index, browser)) = &state.mode {