chore: migrate to Rust edition 2024

thewrz · claude · thewrz · commit 22cbdf6ea503 · 2026-06-24T20:07:41.000-07:00
Bumps `edition = "2024"` and `rust-version = "1.85"` (the edition's MSRV;
CI installs stable, so this is satisfied). The migration is mechanical and
behavior-preserving:

- `cargo fix --edition` idiom fixes: redundant `ref` in match patterns
  dropped (match ergonomics), `expr` macro fragments pinned to `expr_2021`
  where the 2024 superset behavior isn't wanted.
- rustfmt 2024 style edition reflow (import ordering, short single-line
  `if`/`else`).
- Renamed the `gen` closure binding in the playback test — `gen` is a
  reserved keyword in edition 2024 (replaces the `r#gen` raw-ident escape
  cargo fix would otherwise leave behind).
- Raising the MSRV to 1.85 unlocked two MSRV-gated clippy suggestions, both
  applied: `Option::map_or(true, ..)` → `is_none_or` in the decoder, and
  `let x = match ..; x` → return the match directly in `update()`.

The pipewire link/registry paths flagged by the 2024 temporary-scope lint
use named `let` bindings, so their drop order is unchanged; a force-enabled
`tail_expr_drop_order` build reports no warnings. cargo build/test, clippy
(--all-targets --all-features -D warnings), fmt, and deny all pass.

Co-Authored-By: Claude Opus 4.8 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "honkhonk"
 version = "0.1.0"
-edition = "2021"
-rust-version = "1.80"
+edition = "2024"
+rust-version = "1.85"
 license = "MIT"
 description = "Wayland-native Linux soundboard"
 repository = "https://github.com/thewrz/HonkHonk"
diff --git a/benches/grid_render.rs b/benches/grid_render.rs
@@ -6,10 +6,10 @@
 
 mod support;
 
-use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
+use criterion::{BenchmarkId, Criterion, criterion_group, criterion_main};
 
 use support::{
-    init_wgpu, make_sounds, render_tiny_skia, self_check, sound_refs, try_render_wgpu, GridFixture,
+    GridFixture, init_wgpu, make_sounds, render_tiny_skia, self_check, sound_refs, try_render_wgpu,
 };
 
 /// Tile counts ADR-009 anchors the baseline against.
diff --git a/benches/support/mod.rs b/benches/support/mod.rs
@@ -21,7 +21,7 @@ use iced_runtime::user_interface::{Cache, UserInterface};
 
 use honkhonk::app::Message;
 use honkhonk::state::{AudioFormat, SlotMap, SoundEntry, SoundMetaStore};
-use honkhonk::ui::sound_grid::{view_grid, GridCtx};
+use honkhonk::ui::sound_grid::{GridCtx, view_grid};
 
 const CATEGORIES: &[&str] = &["Honk", "Memes", "Reactions", "Voicelines", "Music", "SFX"];
 
diff --git a/src/app/mod.rs b/src/app/mod.rs
@@ -224,7 +224,7 @@ fn shortcuts_stream_sub(
     use iced::futures::SinkExt;
     use iced::futures::StreamExt;
     iced::stream::channel(16, async move |mut tx| {
-        use crate::shortcuts::{portal, ShortcutEvent};
+        use crate::shortcuts::{ShortcutEvent, portal};
         let stream = portal::shortcut_stream(window_id);
         let mut stream = std::pin::pin!(stream);
         while let Some(ev) = stream.next().await {
@@ -549,7 +549,7 @@ impl HonkHonk {
     }
 
     pub fn update(&mut self, message: Message) -> Task<Message> {
-        let task = match message {
+        match message {
             Message::ToggleVisibility => {
                 self.visible = !self.visible;
                 Task::none()
@@ -1149,8 +1149,7 @@ impl HonkHonk {
                     mode,
                 },
             ),
-        };
-        task
+        }
     }
 
     /// Process every audio event queued since the last poll tick.
@@ -1470,7 +1469,7 @@ impl HonkHonk {
         ));
 
         // Overlay context menu at window level so cursor coords map exactly.
-        if let (Some(ref sound_id), Some(pos)) = (&self.context_menu, self.context_menu_pos) {
+        if let (Some(sound_id), Some(pos)) = (&self.context_menu, self.context_menu_pos) {
             let found = self.sounds.iter().find(|s| s.id == *sound_id);
             layers.push(sound_grid::context_menu_overlay(
                 found,
diff --git a/src/app/playback.rs b/src/app/playback.rs
@@ -223,9 +223,9 @@ mod tests {
             channels: 1,
             duration: std::time::Duration::from_millis(100),
         };
-        let dispatch = |gen: u64| PlaybackDispatch {
-            generation: gen,
-            voice_id: gen,
+        let dispatch = |generation: u64| PlaybackDispatch {
+            generation,
+            voice_id: generation,
             gain: 1.0,
             effects,
             mode: PlayMode::Concurrent,
diff --git a/src/audio/decoder.rs b/src/audio/decoder.rs
@@ -116,10 +116,7 @@ fn decode_packets(
         channels.get_or_insert(spec.channels.count() as u16);
         let capacity = decoded.capacity();
 
-        if sample_buf
-            .as_ref()
-            .map_or(true, |b| capacity > b.capacity())
-        {
+        if sample_buf.as_ref().is_none_or(|b| capacity > b.capacity()) {
             sample_buf = Some(SampleBuffer::<f32>::new(capacity as u64, spec));
         }
         let buf = sample_buf.as_mut().expect("buffer just initialized");
diff --git a/src/audio/effects/formant.rs b/src/audio/effects/formant.rs
@@ -20,9 +20,9 @@
 //! allocation, locking, or syscalls. [`AudioEffect::process`] feeds samples one
 //! at a time through the node's `tick`, which is allocation-free.
 
-use super::formant_dsp::{estimate_envelope, read_polar, recombine, Ratios, BINS, ENV_EPS, WINDOW};
-use super::formant_preset::FormantPreset;
 use super::AudioEffect;
+use super::formant_dsp::{BINS, ENV_EPS, Ratios, WINDOW, estimate_envelope, read_polar, recombine};
+use super::formant_preset::FormantPreset;
 use crate::audio::error::EffectsError;
 // `Complex32` is re-exported through `fundsp::prelude32::*` (via `fundsp::math`,
 // which `pub use num_complex::Complex32`), so no direct `num_complex` dependency
diff --git a/src/audio/effects/formant_dsp.rs b/src/audio/effects/formant_dsp.rs
@@ -146,11 +146,7 @@ pub(crate) mod test_signal {
             num += f * mag;
             den += mag;
         }
-        if den > 0.0 {
-            num / den
-        } else {
-            0.0
-        }
+        if den > 0.0 { num / den } else { 0.0 }
     }
 
     /// A two-formant synthetic "vowel": a buzz fundamental with energy
diff --git a/src/audio/effects/mod.rs b/src/audio/effects/mod.rs
@@ -21,7 +21,7 @@ pub use filter::BandpassFilterEffect;
 pub use flanger::Flanger;
 pub use formant::FormantPitchEffect;
 pub use formant_preset::FormantPreset;
-pub use layout::{default_chain, EffectSlot};
+pub use layout::{EffectSlot, default_chain};
 pub use modulation::RingModEffect;
 pub use pitch::PitchShiftEffect;
 pub use preset::PitchPreset;
diff --git a/src/audio/effects/pitch.rs b/src/audio/effects/pitch.rs
@@ -18,8 +18,8 @@
 //! Before the first full block is ready the FIFO underflows and we emit silence —
 //! this is the algorithmic latency reported by [`AudioEffect::latency_samples`].
 
-use super::preset::PitchPreset;
 use super::AudioEffect;
+use super::preset::PitchPreset;
 use crate::audio::error::EffectsError;
 use pitch_shift::{Shifter, TOTAL_F32};
 
diff --git a/src/audio/effects/settings.rs b/src/audio/effects/settings.rs
@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use super::{default_chain, EffectChain, EffectSlot};
+use super::{EffectChain, EffectSlot, default_chain};
 
 #[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize)]
 pub struct PitchEffectSettings {
diff --git a/src/audio/engine.rs b/src/audio/engine.rs
@@ -1,20 +1,20 @@
 use std::cell::{Cell, RefCell};
 use std::rc::Rc;
-use std::sync::mpsc;
 use std::sync::Arc;
+use std::sync::mpsc;
 
 use super::confd;
 use super::effects::EffectSettings;
 use super::error::{AudioError, EngineErrorEvent};
 mod playback_streams;
 use super::playback;
-use super::registry::{setup_registry_listener, RegistryConfig};
+use super::registry::{RegistryConfig, setup_registry_listener};
 use super::router::{Router, RouterEvent};
 use super::streams;
 use super::voices::{FinishedVoice, VoicePool, VoiceSpec};
 use playback_streams::{
-    active_format_conflict, ensure_playback_streams, monitor_enabled, rebuild_monitor_stream,
-    PlaybackStreams,
+    PlaybackStreams, active_format_conflict, ensure_playback_streams, monitor_enabled,
+    rebuild_monitor_stream,
 };
 
 const SINK_NODE_NAME: &str = "honkhonk-mix";
diff --git a/src/audio/engine/playback_streams.rs b/src/audio/engine/playback_streams.rs
@@ -1,4 +1,4 @@
-use super::{playback, AudioEvent, EngineCtx, EngineErrorEvent, SINK_NODE_NAME};
+use super::{AudioEvent, EngineCtx, EngineErrorEvent, SINK_NODE_NAME, playback};
 
 #[derive(Default)]
 pub(super) struct PlaybackStreams {
diff --git a/src/audio/mixer.rs b/src/audio/mixer.rs
@@ -9,7 +9,7 @@
 //!
 //! Until then, `process_block` is a transparent passthrough.
 
-use crate::audio::effects::{default_chain, EffectChain};
+use crate::audio::effects::{EffectChain, default_chain};
 use crate::audio::error::EffectsError;
 
 /// Holds the effect chain and applies it to mic audio blocks.
diff --git a/src/audio/mod.rs b/src/audio/mod.rs
@@ -12,12 +12,12 @@ mod store;
 pub mod streams;
 pub mod voices;
 
-pub use decoder::{decode, DecodedAudio};
+pub use decoder::{DecodedAudio, decode};
 pub use effects::{AudioEffect, EffectChain, EffectsCommand, EffectsEvent};
 #[cfg(test)]
 pub(crate) use engine::test_handle;
-pub use engine::{spawn, AudioCommand, AudioEvent, AudioHandle, PlayMode};
-pub use envelope::{Envelope, ENVELOPE_BUCKETS};
+pub use engine::{AudioCommand, AudioEvent, AudioHandle, PlayMode, spawn};
+pub use envelope::{ENVELOPE_BUCKETS, Envelope};
 pub use error::{AudioError, EffectsError, EngineErrorEvent, RouterError, WatcherError};
 pub use router::{AppIdentity, RouteIntent, Router, RouterCommand, RouterEvent};
 pub use store::{AudioStore, CachedPcm, DEFAULT_PCM_CAP_BYTES};
diff --git a/src/shortcuts/portal.rs b/src/shortcuts/portal.rs
@@ -1,10 +1,10 @@
 use std::collections::HashMap;
 
-use ashpd::desktop::global_shortcuts::NewShortcut;
 use ashpd::WindowIdentifier;
+use ashpd::desktop::global_shortcuts::NewShortcut;
 use iced::futures::{SinkExt, Stream, StreamExt};
 use tokio::sync::mpsc;
-use tokio::time::{timeout, Duration};
+use tokio::time::{Duration, timeout};
 use zbus::zvariant::{OwnedObjectPath, OwnedValue, Value};
 
 use super::{PortalCommand, ShortcutEvent};
@@ -208,7 +208,7 @@ pub fn shortcut_stream(_window_id: Option<WindowIdentifier>) -> impl Stream<Item
         use ashpd::desktop::global_shortcuts::GlobalShortcuts;
 
         macro_rules! bail {
-            ($ctx:expr, $err:expr) => {{
+            ($ctx:expr_2021, $err:expr_2021) => {{
                 let _ = tx
                     .send(ShortcutEvent::Failed(format!("{}: {}", $ctx, $err)))
                     .await;
diff --git a/src/state/library.rs b/src/state/library.rs
@@ -1,5 +1,5 @@
-use std::collections::hash_map::DefaultHasher;
 use std::collections::HashMap;
+use std::collections::hash_map::DefaultHasher;
 use std::hash::{Hash, Hasher};
 use std::path::{Path, PathBuf};
 
diff --git a/src/state/sound_meta.rs b/src/state/sound_meta.rs
@@ -255,10 +255,12 @@ mod tests {
     #[test]
     fn is_default_detects_all_fields_at_default() {
         assert!(SoundMeta::default().is_default());
-        assert!(!SoundMeta {
-            favorite: true,
-            ..Default::default()
-        }
-        .is_default());
+        assert!(
+            !SoundMeta {
+                favorite: true,
+                ..Default::default()
+            }
+            .is_default()
+        );
     }
 }
diff --git a/src/tray/mod.rs b/src/tray/mod.rs
@@ -1,3 +1,3 @@
 mod icon;
 
-pub use icon::{build_tray, TrayEvent, TrayHandle};
+pub use icon::{TrayEvent, TrayHandle, build_tray};
diff --git a/src/ui/effects_panel.rs b/src/ui/effects_panel.rs
@@ -3,8 +3,8 @@
 //! the audio thread. The Iced view lives in [`super::effects_panel_view`]; this
 //! module holds only the testable, render-free logic.
 
-use crate::audio::effects::{EffectSettings, EffectSlot};
 use crate::audio::AudioCommand;
+use crate::audio::effects::{EffectSettings, EffectSlot};
 
 /// A named voice-effect preset.
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
@@ -297,7 +297,7 @@ pub fn preset_commands(preset: PresetId) -> Vec<AudioCommand> {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::audio::{effects::EffectSlot, AudioCommand};
+    use crate::audio::{AudioCommand, effects::EffectSlot};
 
     fn has_unbypass(cmds: &[AudioCommand], slot: EffectSlot) -> bool {
         cmds.iter().any(|c| {
diff --git a/src/ui/effects_panel_view.rs b/src/ui/effects_panel_view.rs
@@ -5,7 +5,7 @@
 
 use std::ops::RangeInclusive;
 
-use iced::widget::{button, column, container, row, slider, text, Column, Space};
+use iced::widget::{Column, Space, button, column, container, row, slider, text};
 use iced::{Alignment, Border, Element, Length};
 
 use crate::app::Message;
diff --git a/src/ui/now_playing.rs b/src/ui/now_playing.rs
@@ -3,16 +3,16 @@ use std::sync::Arc;
 use std::time::{Duration, Instant};
 
 use iced::widget::canvas;
-use iced::widget::{container, row, space, text, Column, Space};
+use iced::widget::{Column, Space, container, row, space, text};
 use iced::{Border, Element, Length};
 
 use crate::app::Message;
-use crate::audio::{Envelope, ENVELOPE_BUCKETS};
+use crate::audio::{ENVELOPE_BUCKETS, Envelope};
 use crate::state::SoundEntry;
 use crate::ui::playhead::PlayheadClock;
 use crate::ui::theme::{self, Hh, Theme};
 use crate::ui::volume;
-use crate::ui::waveform::{render_key, RenderKey};
+use crate::ui::waveform::{RenderKey, render_key};
 
 /// Fixed main-column slot height so playback state changes do not resize the
 /// grid scrollable viewport (#147).
diff --git a/src/ui/settings.rs b/src/ui/settings.rs
@@ -1,7 +1,7 @@
 #[allow(unused_imports)]
 use iced::{
-    widget::{button, column, container, pick_list, row, scrollable, text, Column, Row, Space},
     Alignment, Element, Length,
+    widget::{Column, Row, Space, button, column, container, pick_list, row, scrollable, text},
 };
 
 use crate::app::{HonkHonk, Message, SettingsSection};
@@ -47,7 +47,7 @@ impl std::fmt::Display for InputDeviceOption {
     }
 }
 use crate::settings::{
-    ControlType, SettingCategory, SettingDef, SettingId, SettingValue, SETTINGS_REGISTRY,
+    ControlType, SETTINGS_REGISTRY, SettingCategory, SettingDef, SettingId, SettingValue,
 };
 use crate::ui::theme::{self, Hh, Theme};
 
diff --git a/src/ui/side_panel/mod.rs b/src/ui/side_panel/mod.rs
@@ -8,5 +8,5 @@ mod geometry;
 mod view;
 
 pub use anim::{PanelAnim, SLIDE_DURATION};
-pub use geometry::{panel_geometry, PanelRect};
-pub use view::{view_side_panel, SidePanelConfig};
+pub use geometry::{PanelRect, panel_geometry};
+pub use view::{SidePanelConfig, view_side_panel};
diff --git a/src/ui/side_panel/view.rs b/src/ui/side_panel/view.rs
@@ -8,7 +8,7 @@
 //! input lands where it is drawn.
 
 use iced::alignment::{Horizontal, Vertical};
-use iced::widget::{button, column, container, float, mouse_area, row, scrollable, text, Space};
+use iced::widget::{Space, button, column, container, float, mouse_area, row, scrollable, text};
 use iced::{Alignment, Background, Border, Color, Element, Length, Vector};
 
 use crate::app::Message;
diff --git a/src/ui/slot_manager.rs b/src/ui/slot_manager.rs
@@ -1,4 +1,4 @@
-use iced::widget::{button, column, container, row, scrollable, text, Column, Row, Space};
+use iced::widget::{Column, Row, Space, button, column, container, row, scrollable, text};
 use iced::{Element, Length};
 
 use crate::app::Message;
diff --git a/src/ui/sound_grid.rs b/src/ui/sound_grid.rs
@@ -1,5 +1,5 @@
 use iced::widget::{button, column, container, mouse_area, row, text};
-use iced::{mouse, Element, Length};
+use iced::{Element, Length, mouse};
 
 use crate::app::Message;
 use crate::state::{SlotMap, SoundEntry, SoundMetaStore};
diff --git a/src/ui/sound_tile.rs b/src/ui/sound_tile.rs
@@ -44,11 +44,7 @@ pub fn seed_from_sound_id(id: &str) -> u64 {
         (acc ^ u64::from(byte)).wrapping_mul(FNV_PRIME)
     });
 
-    if seed == 0 {
-        FNV_OFFSET_BASIS
-    } else {
-        seed
-    }
+    if seed == 0 { FNV_OFFSET_BASIS } else { seed }
 }
 
 pub fn rotation_degrees(seed: u64) -> f32 {
diff --git a/src/ui/volume.rs b/src/ui/volume.rs
@@ -1,5 +1,5 @@
-use iced::widget::{row, slider, text};
 use iced::Element;
+use iced::widget::{row, slider, text};
 
 use crate::app::Message;
 use crate::ui::theme::{self, Hh, Theme};

Original file line number	Diff line number	Diff line change
`@@ -146,11 +146,7 @@ pub(crate) mod test_signal {`
`146`	`146`	`num += f * mag;`
`147`	`147`	`den += mag;`
`148`	`148`	`}`
`149`		`- if den > 0.0 {`
`150`		`- num / den`
`151`		`- } else {`
`152`		`- 0.0`
`153`		`- }`
	`149`	`+ if den > 0.0 { num / den } else { 0.0 }`
`154`	`150`	`}`
`155`	`151`
`156`	`152`	`/// A two-formant synthetic "vowel": a buzz fundamental with energy`