From 5db07090caef31e3c2464ee931a1432a3082d009 Mon Sep 17 00:00:00 2001 From: Robbert van der Helm Date: Wed, 1 Feb 2023 14:52:45 +0100 Subject: [PATCH] Replace match with if-let Clippy didn't like this. --- src/wrapper/clap/wrapper.rs | 12 +++++------- src/wrapper/vst3/wrapper.rs | 11 ++++------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/src/wrapper/clap/wrapper.rs b/src/wrapper/clap/wrapper.rs index fad200c8..7cd7a673 100644 --- a/src/wrapper/clap/wrapper.rs +++ b/src/wrapper/clap/wrapper.rs @@ -1643,16 +1643,14 @@ impl Wrapper

{ { let event = &*(event as *const clap_event_midi_sysex); + // `NoteEvent::from_midi` prints some tracing if parsing fails, which is not + // necessarily an error assert!(!event.buffer.is_null()); let sysex_buffer = std::slice::from_raw_parts(event.buffer, event.size as usize); - match NoteEvent::from_midi(raw_event.time - current_sample_idx as u32, sysex_buffer) + if let Ok(note_event) = + NoteEvent::from_midi(raw_event.time - current_sample_idx as u32, sysex_buffer) { - Ok(note_event) => { - input_events.push_back(note_event); - } - // `NoteEvent::from_midi` prints some tracing if parsing fails, which is not - // necessarily an error - Err(_) => (), + input_events.push_back(note_event); }; } _ => { diff --git a/src/wrapper/vst3/wrapper.rs b/src/wrapper/vst3/wrapper.rs index ecc4f1fa..880d7ec8 100644 --- a/src/wrapper/vst3/wrapper.rs +++ b/src/wrapper/vst3/wrapper.rs @@ -1228,16 +1228,13 @@ impl IAudioProcessor for Wrapper

{ // 0 = kMidiSysEx let event = event.event.data; + // `NoteEvent::from_midi` prints some tracing if parsing fails, which is + // not necessarily an error assert!(!event.bytes.is_null()); let sysex_buffer = std::slice::from_raw_parts(event.bytes, event.size as usize); - match NoteEvent::from_midi(timing, sysex_buffer) { - Ok(note_event) => { - process_events.push(ProcessEvent::NoteEvent(note_event)); - } - // `NoteEvent::from_midi` prints some tracing if parsing fails, - // which is not necessarily an error - Err(_) => (), + if let Ok(note_event) = NoteEvent::from_midi(timing, sysex_buffer) { + process_events.push(ProcessEvent::NoteEvent(note_event)); }; } }