Skip to content

Commit

Permalink
removed clippy errors
Browse files Browse the repository at this point in the history
  • Loading branch information
@b-ma
b-ma committed Nov 16, 2021
1 parent c78f69c commit 76a1e43
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 44 deletions.
78 changes: 39 additions & 39 deletions src/alloc.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -683,7 +683,7 @@ mod tests {
let mut signal = alloc.silence();
signal.copy_from_slice(&[1.; BUFFER_SIZE]);

let mut buffer = AudioBuffer::new(signal.clone());
let mut buffer = AudioBuffer::new(signal);

// make sure 1 -> 1 does nothing
buffer.mix(1, ChannelInterpretation::Speakers);
Expand Down Expand Up @@ -715,7 +715,7 @@ mod tests {
let mut signal = alloc.silence();
signal.copy_from_slice(&[1.; BUFFER_SIZE]);

let mut buffer = AudioBuffer::new(signal.clone());
let mut buffer = AudioBuffer::new(signal);

buffer.mix(4, ChannelInterpretation::Speakers);
assert_eq!(buffer.number_of_channels(), 4);
Expand Down Expand Up @@ -748,7 +748,7 @@ mod tests {
let mut signal = alloc.silence();
signal.copy_from_slice(&[1.; BUFFER_SIZE]);

let mut buffer = AudioBuffer::new(signal.clone());
let mut buffer = AudioBuffer::new(signal);

buffer.mix(6, ChannelInterpretation::Speakers);
assert_eq!(buffer.number_of_channels(), 6);
Expand Down Expand Up @@ -793,8 +793,8 @@ mod tests {
let mut right_signal = alloc.silence();
right_signal.copy_from_slice(&[0.5; BUFFER_SIZE]);

let mut buffer = AudioBuffer::new(left_signal.clone());
buffer.channels.push(right_signal.clone());
let mut buffer = AudioBuffer::new(left_signal);
buffer.channels.push(right_signal);

assert_eq!(buffer.number_of_channels(), 2);
assert_float_eq!(
Expand Down Expand Up @@ -839,8 +839,8 @@ mod tests {
let mut right_signal = alloc.silence();
right_signal.copy_from_slice(&[0.5; BUFFER_SIZE]);

let mut buffer = AudioBuffer::new(left_signal.clone());
buffer.channels.push(right_signal.clone());
let mut buffer = AudioBuffer::new(left_signal);
buffer.channels.push(right_signal);

assert_eq!(buffer.number_of_channels(), 2);
assert_float_eq!(
Expand Down Expand Up @@ -899,10 +899,10 @@ mod tests {
let mut s_right_signal = alloc.silence();
s_right_signal.copy_from_slice(&[1.; BUFFER_SIZE]);

let mut buffer = AudioBuffer::new(left_signal.clone());
buffer.channels.push(right_signal.clone());
buffer.channels.push(s_left_signal.clone());
buffer.channels.push(s_right_signal.clone());
let mut buffer = AudioBuffer::new(left_signal);
buffer.channels.push(right_signal);
buffer.channels.push(s_left_signal);
buffer.channels.push(s_right_signal);

assert_eq!(buffer.number_of_channels(), 4);
assert_float_eq!(
Expand Down Expand Up @@ -972,8 +972,8 @@ mod tests {
let mut right_signal = alloc.silence();
right_signal.copy_from_slice(&[0.5; BUFFER_SIZE]);

let mut buffer = AudioBuffer::new(left_signal.clone());
buffer.channels.push(right_signal.clone());
let mut buffer = AudioBuffer::new(left_signal);
buffer.channels.push(right_signal);

assert_eq!(buffer.number_of_channels(), 2);
assert_float_eq!(
Expand Down Expand Up @@ -1007,10 +1007,10 @@ mod tests {
let mut s_right_signal = alloc.silence();
s_right_signal.copy_from_slice(&[0.25; BUFFER_SIZE]);

let mut buffer = AudioBuffer::new(left_signal.clone());
buffer.channels.push(right_signal.clone());
buffer.channels.push(s_left_signal.clone());
buffer.channels.push(s_right_signal.clone());
let mut buffer = AudioBuffer::new(left_signal);
buffer.channels.push(right_signal);
buffer.channels.push(s_left_signal);
buffer.channels.push(s_right_signal);

assert_eq!(buffer.number_of_channels(), 4);
assert_float_eq!(
Expand Down Expand Up @@ -1058,12 +1058,12 @@ mod tests {
let mut s_right_signal = alloc.silence();
s_right_signal.copy_from_slice(&[0.5; BUFFER_SIZE]);

let mut buffer = AudioBuffer::new(left_signal.clone());
buffer.channels.push(right_signal.clone());
buffer.channels.push(center_signal.clone());
buffer.channels.push(low_freq_signal.clone());
buffer.channels.push(s_left_signal.clone());
buffer.channels.push(s_right_signal.clone());
let mut buffer = AudioBuffer::new(left_signal);
buffer.channels.push(right_signal);
buffer.channels.push(center_signal);
buffer.channels.push(low_freq_signal);
buffer.channels.push(s_left_signal);
buffer.channels.push(s_right_signal);

assert_eq!(buffer.number_of_channels(), 6);
assert_float_eq!(
Expand Down Expand Up @@ -1119,10 +1119,10 @@ mod tests {
let mut s_right_signal = alloc.silence();
s_right_signal.copy_from_slice(&[1.; BUFFER_SIZE]);

let mut buffer = AudioBuffer::new(left_signal.clone());
buffer.channels.push(right_signal.clone());
buffer.channels.push(s_left_signal.clone());
buffer.channels.push(s_right_signal.clone());
let mut buffer = AudioBuffer::new(left_signal);
buffer.channels.push(right_signal);
buffer.channels.push(s_left_signal);
buffer.channels.push(s_right_signal);

assert_eq!(buffer.number_of_channels(), 4);
assert_float_eq!(
Expand Down Expand Up @@ -1175,12 +1175,12 @@ mod tests {
let mut s_right_signal = alloc.silence();
s_right_signal.copy_from_slice(&[0.5; BUFFER_SIZE]);

let mut buffer = AudioBuffer::new(left_signal.clone());
buffer.channels.push(right_signal.clone());
buffer.channels.push(center_signal.clone());
buffer.channels.push(low_freq_signal.clone());
buffer.channels.push(s_left_signal.clone());
buffer.channels.push(s_right_signal.clone());
let mut buffer = AudioBuffer::new(left_signal);
buffer.channels.push(right_signal);
buffer.channels.push(center_signal);
buffer.channels.push(low_freq_signal);
buffer.channels.push(s_left_signal);
buffer.channels.push(s_right_signal);

assert_eq!(buffer.number_of_channels(), 6);
assert_float_eq!(
Expand Down Expand Up @@ -1246,12 +1246,12 @@ mod tests {
let mut s_right_signal = alloc.silence();
s_right_signal.copy_from_slice(&[0.5; BUFFER_SIZE]);

let mut buffer = AudioBuffer::new(left_signal.clone());
buffer.channels.push(right_signal.clone());
buffer.channels.push(center_signal.clone());
buffer.channels.push(low_freq_signal.clone());
buffer.channels.push(s_left_signal.clone());
buffer.channels.push(s_right_signal.clone());
let mut buffer = AudioBuffer::new(left_signal);
buffer.channels.push(right_signal);
buffer.channels.push(center_signal);
buffer.channels.push(low_freq_signal);
buffer.channels.push(s_left_signal);
buffer.channels.push(s_right_signal);

assert_eq!(buffer.number_of_channels(), 6);
assert_float_eq!(
Expand Down
8 changes: 4 additions & 4 deletions src/node/waveshaper.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -363,14 +363,14 @@ impl WaveShaperRenderer {
Self {
sample_rate,
oversample,
curve,
curve_set,
channels_x2,
channels_x4,
upsampler_x2,
upsampler_x4,
downsampler_x2,
downsampler_x4,
channels_x2,
channels_x4,
curve,
curve_set,
receiver,
}
}
Expand Down
4 changes: 3 additions & 1 deletion tests/offline.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ fn test_offline_render() {
const LENGTH: usize = 555;

// not a multiple of BUFFER_SIZE
assert!(LENGTH % BUFFER_SIZE != 0);
// compute modulo before to avoid clippy::assertions-on-constants errors
let modulo = LENGTH % BUFFER_SIZE;
assert!(modulo != 0);

let mut context = OfflineAudioContext::new(2, LENGTH, SampleRate(44_100));
assert_eq!(context.length(), LENGTH);
Expand Down

0 comments on commit 76a1e43

Please sign in to comment.