Skip to content
This repository was archived by the owner on Mar 27, 2024. It is now read-only.

Commit aa7cc43

Browse files
authored
Merge pull request #102 from RustAudio/rustfmt-ci
Run 'cargo fmt'; add 'cargo fmt' check to travis
2 parents 8c70906 + add9106 commit aa7cc43

18 files changed

+480
-685
lines changed

.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,23 @@ jobs:
66
before_script:
77
- rustup toolchain install stable
88
- rustup component add --toolchain stable clippy-preview || cargo install --git https://github.com/rust-lang/rust-clippy/ --force clippy
9+
- rustup component add rustfmt
910
script:
1011
- cargo +stable clippy
1112
- cargo build --verbose
1213
- cargo test --verbose
14+
- cargo fmt --all -- --check
1315
-
1416
os: osx
1517
before_script:
1618
- rustup toolchain install stable
1719
- rustup component add --toolchain stable clippy-preview || cargo install --git https://github.com/rust-lang/rust-clippy/ --force clippy
20+
- rustup component add rustfmt
1821
script:
1922
- cargo +stable clippy
2023
- cargo build --verbose
2124
- cargo test --verbose
25+
- cargo fmt --all -- --check
2226

2327
# deploy crates and documentation conditionally
2428
# deploy on cargo if tagged master release

examples/dimension_expander.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,8 @@ impl PluginParameters for DimensionExpanderParameters {
211211
0 => "Size",
212212
1 => "Dry/Wet",
213213
_ => "",
214-
}.to_string()
214+
}
215+
.to_string()
215216
}
216217

217218
fn set_parameter(&self, index: i32, val: f32) {

examples/fwd_midi.rs

Lines changed: 54 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,76 @@
11
#[macro_use]
22
extern crate vst;
33

4-
use vst::plugin::{Info, Plugin, CanDo, HostCallback};
5-
use vst::event::{Event, MidiEvent};
6-
use vst::buffer::{AudioBuffer, SendEventBuffer};
74
use vst::api;
5+
use vst::buffer::{AudioBuffer, SendEventBuffer};
6+
use vst::event::{Event, MidiEvent};
7+
use vst::plugin::{CanDo, HostCallback, Info, Plugin};
88

99
plugin_main!(MyPlugin); // Important!
1010

1111
#[derive(Default)]
1212
struct MyPlugin {
13-
host: HostCallback,
14-
events: Vec<MidiEvent>,
15-
send_buffer: SendEventBuffer,
13+
host: HostCallback,
14+
events: Vec<MidiEvent>,
15+
send_buffer: SendEventBuffer,
1616
}
1717

1818
impl MyPlugin {
19-
fn send_midi(&mut self) {
20-
self.send_buffer.send_events(&self.events, &mut self.host);
21-
self.events.clear();
22-
}
19+
fn send_midi(&mut self) {
20+
self.send_buffer.send_events(&self.events, &mut self.host);
21+
self.events.clear();
22+
}
2323
}
2424

2525
impl Plugin for MyPlugin {
26-
fn new(host: HostCallback) -> Self {
27-
let mut p = MyPlugin::default();
28-
p.host = host;
29-
p
30-
}
26+
fn new(host: HostCallback) -> Self {
27+
let mut p = MyPlugin::default();
28+
p.host = host;
29+
p
30+
}
3131

32-
fn get_info(&self) -> Info {
33-
Info {
34-
name: "fwd_midi".to_string(),
35-
unique_id: 7357001, // Used by hosts to differentiate between plugins.
36-
..Default::default()
37-
}
38-
}
32+
fn get_info(&self) -> Info {
33+
Info {
34+
name: "fwd_midi".to_string(),
35+
unique_id: 7357001, // Used by hosts to differentiate between plugins.
36+
..Default::default()
37+
}
38+
}
3939

40-
fn process_events(&mut self, events: &api::Events) {
41-
for e in events.events() {
42-
match e {
43-
Event::Midi(e) => self.events.push(e),
44-
_ => (),
45-
}
46-
}
47-
}
40+
fn process_events(&mut self, events: &api::Events) {
41+
for e in events.events() {
42+
match e {
43+
Event::Midi(e) => self.events.push(e),
44+
_ => (),
45+
}
46+
}
47+
}
4848

49-
fn process(&mut self, buffer: &mut AudioBuffer<f32>) {
50-
for (input, output) in buffer.zip() {
51-
for (in_sample, out_sample) in input.iter().zip(output) {
52-
*out_sample = *in_sample;
53-
}
54-
}
55-
self.send_midi();
56-
}
49+
fn process(&mut self, buffer: &mut AudioBuffer<f32>) {
50+
for (input, output) in buffer.zip() {
51+
for (in_sample, out_sample) in input.iter().zip(output) {
52+
*out_sample = *in_sample;
53+
}
54+
}
55+
self.send_midi();
56+
}
5757

58-
fn process_f64(&mut self, buffer: &mut AudioBuffer<f64>) {
59-
for (input, output) in buffer.zip() {
60-
for (in_sample, out_sample) in input.iter().zip(output) {
61-
*out_sample = *in_sample;
62-
}
63-
}
64-
self.send_midi();
65-
}
58+
fn process_f64(&mut self, buffer: &mut AudioBuffer<f64>) {
59+
for (input, output) in buffer.zip() {
60+
for (in_sample, out_sample) in input.iter().zip(output) {
61+
*out_sample = *in_sample;
62+
}
63+
}
64+
self.send_midi();
65+
}
6666

67-
fn can_do(&self, can_do: CanDo) -> vst::api::Supported {
68-
use vst::api::Supported::*;
69-
use vst::plugin::CanDo::*;
67+
fn can_do(&self, can_do: CanDo) -> vst::api::Supported {
68+
use vst::api::Supported::*;
69+
use vst::plugin::CanDo::*;
7070

71-
match can_do {
72-
SendEvents | SendMidiEvent | ReceiveEvents | ReceiveMidiEvent => Yes,
73-
_ => No,
74-
}
75-
}
71+
match can_do {
72+
SendEvents | SendMidiEvent | ReceiveEvents | ReceiveMidiEvent => Yes,
73+
_ => No,
74+
}
75+
}
7676
}
77-

examples/gain_effect.rs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,17 @@ struct GainEffectParameters {
3939
// 0.5 means it's halfway up.
4040
impl Default for GainEffect {
4141
fn default() -> GainEffect {
42-
GainEffect { params: Arc::new(GainEffectParameters::default()) }
42+
GainEffect {
43+
params: Arc::new(GainEffectParameters::default()),
44+
}
4345
}
4446
}
4547

4648
impl Default for GainEffectParameters {
4749
fn default() -> GainEffectParameters {
48-
GainEffectParameters { amplitude: AtomicFloat::new(0.5) }
50+
GainEffectParameters {
51+
amplitude: AtomicFloat::new(0.5),
52+
}
4953
}
5054
}
5155

@@ -122,7 +126,8 @@ impl PluginParameters for GainEffectParameters {
122126
match index {
123127
0 => "Amplitude",
124128
_ => "",
125-
}.to_string()
129+
}
130+
.to_string()
126131
}
127132
}
128133

0 commit comments

Comments
 (0)