update deps / fix clippy messages

valsteen · valsteen · commit 452713b40d07 · 2021-06-05T13:57:53.000+02:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/arpegiator/Cargo.toml b/arpegiator/Cargo.toml
@@ -7,20 +7,20 @@ edition = "2018"
 [dependencies]
 vst = { git = "https://github.com/rustaudio/vst-rs" }
 util = { path = "../util" }
-build-info = "0.0.20"
-log = "0.4.11"
+build-info = "0.0.23"
+log = "0.4.14"
 num-traits = "0.2.14"
 itertools = "0.10.0"
-bincode = "1.3.1"
+bincode = "1.3.3"
 midir = "0.7.0"
-async-std = "1.8.0"
-async-channel = "1.5.1"
-futures-lite = "1.11.3"
-ipc-channel = "0.14.1"
-uuid = "0.8.1"
+async-std = "1.9.0"
+async-channel = "1.6.1"
+futures-lite = "1.12.0"
+ipc-channel = "0.15.0"
+uuid = "0.8.2"
 
 [build-dependencies]
-build-info-build = "0.0.20"
+build-info-build = "0.0.23"
 
 [lib]
 name = "arpegiator"
diff --git a/arpegiator/src/midi_messages/device.rs b/arpegiator/src/midi_messages/device.rs
@@ -303,13 +303,7 @@ impl Device {
                         let add_note = output.remove(position);
 
                         if let Some(position) = output.iter().position(|change| {
-                            match change {
-                                DeviceChange::NoteExpressionChange { time: time_2, expression, note: note_2 }
-                                if time_1 == *time_2 && note_1.channel == note_2.channel => {
-                                    matches!(expression, Expression::PitchBend)
-                                }
-                                _ => false
-                            }
+                            matches!(change, DeviceChange::NoteExpressionChange { time: time_2, expression: Expression::PitchBend, note: note_2 } if time_1 == *time_2 && note_1.channel == note_2.channel)
                         }) {
                             output.remove(position);
                         }
diff --git a/arpegiator/src/parameters.rs b/arpegiator/src/parameters.rs
@@ -141,9 +141,9 @@ impl From<i32> for Parameter {
     }
 }
 
-impl Into<i32> for Parameter {
-    fn into(self) -> i32 {
-        self as i32
+impl From<Parameter> for i32 {
+    fn from(p: Parameter) -> Self {
+        p as i32
     }
 }
 
diff --git a/arpegiator_pattern_receiver/Cargo.toml b/arpegiator_pattern_receiver/Cargo.toml
@@ -7,25 +7,25 @@ edition = "2018"
 [dependencies]
 vst = { git = "https://github.com/rustaudio/vst-rs" }
 util = { path = "../util" }
-build-info = "0.0.20"
-log = "0.4.11"
-serde = "1.0.118"
-bincode = "1.3.1"
-async-std = "1.8.0"
-async-channel = "1.5.1"
-futures-lite = "1.11.3"
-ipc-channel = "0.14.1"
+build-info = "0.0.23"
+log = "0.4.14"
+serde = "1.0.126"
+bincode = "1.3.3"
+async-std = "1.9.0"
+async-channel = "1.6.1"
+futures-lite = "1.12.0"
+ipc-channel = "0.15.0"
 itertools = "0.10.0"
 
 [build-dependencies]
-build-info-build = "0.0.20"
+build-info-build = "0.0.23"
 
 [lib]
 name = "arpegiator_pattern_receiver"
 crate-type = ["cdylib", "lib"]
 
 [target.'cfg(target_os = "macos")'.dependencies.mach]
-version = "0.3"
+version = "0.3.2"
 
 [features]
 # this transmits midi via the vst output instead of using an IPC, setting the highest bit to 0 so we transmit
diff --git a/arpegiator_pattern_receiver/src/parameters.rs b/arpegiator_pattern_receiver/src/parameters.rs
@@ -56,9 +56,9 @@ impl From<i32> for Parameter {
     }
 }
 
-impl Into<i32> for Parameter {
-    fn into(self) -> i32 {
-        self as i32
+impl From<Parameter> for i32 {
+    fn from(p: Parameter) -> Self {
+        p as i32
     }
 }
 
diff --git a/audio_data/Cargo.toml b/audio_data/Cargo.toml
@@ -7,11 +7,11 @@ edition = "2018"
 [dependencies]
 vst = { git = "https://github.com/rustaudio/vst-rs" }
 util = { path = "../util" }
-build-info = "0.0.20"
-log = "0.4.11"
+build-info = "0.0.23"
+log = "0.4.14"
 
 [build-dependencies]
-build-info-build = "0.0.20"
+build-info-build = "0.0.23"
 
 [lib]
 name = "audio_data"
diff --git a/max_note_duration/Cargo.toml b/max_note_duration/Cargo.toml
@@ -7,10 +7,10 @@ edition = "2018"
 [dependencies]
 vst = { git = "https://github.com/rustaudio/vst-rs" }
 util = { path = "../util" }
-build-info = "0.0.20"
+build-info = "0.0.23"
 
 [build-dependencies]
-build-info-build = "0.0.20"
+build-info-build = "0.0.23"
 
 [lib]
 name = "max_note_duration"
diff --git a/max_note_duration/src/parameters.rs b/max_note_duration/src/parameters.rs
@@ -27,9 +27,9 @@ impl From<i32> for Parameter {
     }
 }
 
-impl Into<i32> for Parameter {
-    fn into(self) -> i32 {
-        self as i32
+impl From<Parameter> for i32 {
+    fn from(p: Parameter) -> Self {
+        p as i32
     }
 }
 
diff --git a/midi_delay/Cargo.toml b/midi_delay/Cargo.toml
@@ -8,11 +8,11 @@ edition = "2018"
 vst = { git = "https://github.com/rustaudio/vst-rs" }
 util = { path = "../util" }
 log = "0.4.11"
-build-info = "0.0.20"
+build-info = "0.0.23"
 
 [lib]
 name = "midi_delay"
 crate-type = ["cdylib", "lib"]
 
 [build-dependencies]
-build-info-build = "0.0.20"
+build-info-build = "0.0.23"
diff --git a/midi_delay/src/lib.rs b/midi_delay/src/lib.rs
@@ -15,8 +15,7 @@ use vst::plugin::{CanDo, Category, HostCallback, Info, Plugin, PluginParameters}
 
 use parameters::{MidiDelayParameters, Parameter};
 use util::absolute_time_midi_message_vector::AbsoluteTimeMidiMessageVector;
-use util::delayed_message_consumer::{process_scheduled_events, MessageReason, MaxNotesParameter, raw_process_scheduled_events};
-use util::midi_message_type::MidiMessageType;
+use util::delayed_message_consumer::raw_process_scheduled_events;
 use util::parameters::ParameterConversion;
 use vst::host::Host;
 use util::logging::logging_setup;
diff --git a/midi_delay/src/parameters.rs b/midi_delay/src/parameters.rs
@@ -25,9 +25,9 @@ impl From<i32> for Parameter {
     }
 }
 
-impl Into<i32> for Parameter {
-    fn into(self) -> i32 {
-        self as i32
+impl From<Parameter> for i32 {
+    fn from(p: Parameter) -> Self {
+        p as i32
     }
 }
 
diff --git a/note_fan_out/src/parameters.rs b/note_fan_out/src/parameters.rs
@@ -36,14 +36,14 @@ impl From<i32> for Parameter {
             0 => Parameter::Steps,
             1 => Parameter::Selection,
             2 => Parameter::ChannelDistribute,
-            _ => panic!(format!("No such Parameter {}", i)),
+            _ => panic!("No such Parameter {}", i),
         }
     }
 }
 
-impl Into<i32> for Parameter {
-    fn into(self) -> i32 {
-        self as i32
+impl From<Parameter> for i32 {
+    fn from(p: Parameter) -> Self {
+        p as i32
     }
 }
 
@@ -89,9 +89,9 @@ impl From<f32> for ChannelDistribution {
     }
 }
 
-impl Into<f32> for ChannelDistribution {
-    fn into(self) -> f32 {
-        match self {
+impl From<ChannelDistribution> for f32 {
+    fn from(cd: ChannelDistribution) -> f32 {
+        match cd {
             ChannelDistribution::Channels(value) => {
                 // normalize over 15 values, first range is off
                 ((value as f32 - 2.) / 13.) * 14. / 15. + 1. / 15.
diff --git a/note_generator/src/bin/host.rs b/note_generator/src/bin/host.rs
@@ -33,7 +33,7 @@ fn main() {
 
     // Load the plugin
     let mut loader = PluginLoader::load(path, Arc::clone(&host))
-        .unwrap_or_else(|e| panic!(format!("Failed to load plugin: {} {}", e, arg)));
+        .unwrap_or_else(|e| panic!("Failed to load plugin: {} {}", e, arg));
 
     // Create an instance of the plugin
     let mut instance = loader.instance().unwrap();
diff --git a/note_generator/src/parameters.rs b/note_generator/src/parameters.rs
@@ -36,14 +36,14 @@ impl From<i32> for Parameter {
             6 => Parameter::Trigger,
             7 => Parameter::TriggeredPitch,
             8 => Parameter::TriggeredChannel,
-            _ => panic!(format!("No such Parameter {}", i)),
+            _ => panic!("No such Parameter {}", i),
         }
     }
 }
 
-impl Into<i32> for Parameter {
-    fn into(self) -> i32 {
-        self as i32
+impl From<Parameter> for i32 {
+    fn from(parameter: Parameter) -> Self {
+        parameter as i32
     }
 }
 
diff --git a/note_off_delay/Cargo.toml b/note_off_delay/Cargo.toml
@@ -7,11 +7,11 @@ edition = "2018"
 [dependencies]
 vst = { git = "https://github.com/rustaudio/vst-rs" }
 util = { path = "../util" }
-build-info = "0.0.20"
-log = "0.4.11"
+build-info = "0.0.23"
+log = "0.4.14"
 
 [build-dependencies]
-build-info-build = "0.0.20"
+build-info-build = "0.0.23"
 
 [lib]
 name = "note_off_delay"
diff --git a/note_off_delay/src/bin/note_off_host.rs b/note_off_delay/src/bin/note_off_host.rs
@@ -33,7 +33,7 @@ fn main() {
 
     // Load the plugin
     let mut loader = PluginLoader::load(path, Arc::clone(&host))
-        .unwrap_or_else(|e| panic!(format!("Failed to load plugin: {} {}", e, arg)));
+        .unwrap_or_else(|e| panic!("Failed to load plugin: {} {}", e, arg));
 
     // Create an instance of the plugin
     let mut instance = loader.instance().unwrap();
diff --git a/note_off_delay/src/lib.rs b/note_off_delay/src/lib.rs
@@ -68,6 +68,7 @@ impl NoteOffDelayPlugin {
         1.0 / self.sample_rate
     }
 
+    #[allow(dead_code)]
     fn seconds_to_samples(&self, seconds: f32) -> usize {
         (seconds * self.sample_rate) as usize
     }
diff --git a/note_off_delay/src/parameters.rs b/note_off_delay/src/parameters.rs
@@ -5,7 +5,7 @@ use vst::util::ParameterTransfer;
 
 use util::parameter_value_conversion::{f32_to_bool, f32_to_byte};
 use util::parameters::{ParameterConversion, get_exponential_scale_value};
-use util::{duration_display, HostCallbackLock, DelayOffset};
+use util::{HostCallbackLock, DelayOffset};
 use util::delayed_message_consumer::MaxNotesParameter;
 use std::fmt::{Display, Formatter};
 use std::fmt;
@@ -37,9 +37,9 @@ impl From<i32> for Parameter {
     }
 }
 
-impl Into<i32> for Parameter {
-    fn into(self) -> i32 {
-        self as i32
+impl From<Parameter> for i32 {
+    fn from(p: Parameter) -> Self {
+        p as i32
     }
 }
 
diff --git a/util/Cargo.toml b/util/Cargo.toml
@@ -6,21 +6,21 @@ edition = "2018"
 
 [dependencies]
 vst = { git = "https://github.com/rustaudio/vst-rs" }
-global_counter = "0.2.1"
-log = "0.4.11"
-simplelog = "0.9.0"
-build-info = "0.0.20"
-serde = "1.0.118"
-ipc-channel = "0.14.1"
-async-channel = "1.5.1"
-uuid = "0.8.1"
+global_counter = "0.2.2"
+log = "0.4.14"
+simplelog = "0.10.0"
+build-info = "0.0.23"
+serde = "1.0.126"
+ipc-channel = "0.15.0"
+async-channel = "1.6.1"
+uuid = "0.8.2"
 
 [dependencies.log-panics]
 version = "2.0.0"
 features = ["with-backtrace"]
 
 [build-dependencies]
-build-info-build = "0.0.20"
+build-info-build = "0.0.23"
 
 [features]
 default = ["enable_logging"]
diff --git a/util/src/delayed_message_consumer.rs b/util/src/delayed_message_consumer.rs
@@ -266,7 +266,7 @@ pub fn raw_process_scheduled_events(
     let mut queued_messages = AbsoluteTimeMidiMessageVector::default();
     let mut events: Vec<MidiEvent> = vec![];
 
-    for mut message in messages.iter().copied() {
+    for message in messages.iter().copied() {
         if message.play_time_in_samples < current_time_in_samples + samples {
             if message.play_time_in_samples >= current_time_in_samples {
                 events.push(message.new_midi_event(current_time_in_samples));
diff --git a/util/src/messages.rs b/util/src/messages.rs
diff --git a/util/src/raw_message.rs b/util/src/raw_message.rs

Original file line number	Diff line number	Diff line change
`@@ -141,9 +141,9 @@ impl From<i32> for Parameter {`
`141`	`141`	`}`
`142`	`142`	`}`
`143`	`143`
`144`		`-impl Into<i32> for Parameter {`
`145`		`- fn into(self) -> i32 {`
`146`		`- self as i32`
	`144`	`+impl From<Parameter> for i32 {`
	`145`	`+ fn from(p: Parameter) -> Self {`
	`146`	`+ p as i32`
`147`	`147`	`}`
`148`	`148`	`}`
`149`	`149`
Original file line number	Diff line number	Diff line change
`@@ -56,9 +56,9 @@ impl From<i32> for Parameter {`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`
`59`		`-impl Into<i32> for Parameter {`
`60`		`- fn into(self) -> i32 {`
`61`		`- self as i32`
	`59`	`+impl From<Parameter> for i32 {`
	`60`	`+ fn from(p: Parameter) -> Self {`
	`61`	`+ p as i32`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`
Original file line number	Diff line number	Diff line change
`@@ -27,9 +27,9 @@ impl From<i32> for Parameter {`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`
`30`		`-impl Into<i32> for Parameter {`
`31`		`- fn into(self) -> i32 {`
`32`		`- self as i32`
	`30`	`+impl From<Parameter> for i32 {`
	`31`	`+ fn from(p: Parameter) -> Self {`
	`32`	`+ p as i32`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`