diff --git a/src/buffer/blocks.rs b/src/buffer/blocks.rs index ccf8f9ec..470d8915 100644 --- a/src/buffer/blocks.rs +++ b/src/buffer/blocks.rs @@ -3,7 +3,7 @@ use std::marker::PhantomData; #[cfg(feature = "simd")] -use std::simd::{LaneCount, Simd, SupportedLaneCount}; +use std::simd::Simd; use super::SamplesIter; @@ -226,10 +226,7 @@ impl<'slice, 'sample> Block<'slice, 'sample> { pub fn to_channel_simd( &self, sample_index: usize, - ) -> Option> - where - LaneCount: SupportedLaneCount, - { + ) -> Option> { if sample_index > self.samples() { return None; } @@ -258,10 +255,7 @@ impl<'slice, 'sample> Block<'slice, 'sample> { pub unsafe fn to_channel_simd_unchecked( &self, sample_index: usize, - ) -> Simd - where - LaneCount: SupportedLaneCount, - { + ) -> Simd { let mut values = [0.0; LANES]; for (channel_idx, value) in values.iter_mut().enumerate() { *value = *(&(*self.buffers)) @@ -284,10 +278,7 @@ impl<'slice, 'sample> Block<'slice, 'sample> { &mut self, sample_index: usize, vector: Simd, - ) -> bool - where - LaneCount: SupportedLaneCount, - { + ) -> bool { if sample_index > self.samples() { return false; } @@ -319,9 +310,7 @@ impl<'slice, 'sample> Block<'slice, 'sample> { &mut self, sample_index: usize, vector: Simd, - ) where - LaneCount: SupportedLaneCount, - { + ) { let values = vector.to_array(); for (channel_idx, value) in values.into_iter().enumerate() { *(&mut (*self.buffers)) diff --git a/src/buffer/samples.rs b/src/buffer/samples.rs index fae69f42..b1ddf199 100644 --- a/src/buffer/samples.rs +++ b/src/buffer/samples.rs @@ -3,7 +3,7 @@ use std::marker::PhantomData; #[cfg(feature = "simd")] -use std::simd::{LaneCount, Simd, SupportedLaneCount}; +use std::simd::Simd; /// An iterator over all samples in a buffer or block, yielding iterators over each channel for /// every sample. This iteration order offers good cache locality for per-sample access. @@ -168,10 +168,7 @@ impl<'slice, 'sample> ChannelSamples<'slice, 'sample> { /// all values. #[cfg(feature = "simd")] #[inline] - pub fn to_simd(&self) -> Simd - where - LaneCount: SupportedLaneCount, - { + pub fn to_simd(&self) -> Simd { let used_lanes = self.len().max(LANES); let mut values = [0.0; LANES]; for (channel_idx, value) in values.iter_mut().enumerate().take(used_lanes) { @@ -193,10 +190,7 @@ impl<'slice, 'sample> ChannelSamples<'slice, 'sample> { /// Undefined behavior if `LANES > channels.len()`. #[cfg(feature = "simd")] #[inline] - pub unsafe fn to_simd_unchecked(&self) -> Simd - where - LaneCount: SupportedLaneCount, - { + pub unsafe fn to_simd_unchecked(&self) -> Simd { let mut values = [0.0; LANES]; for (channel_idx, value) in values.iter_mut().enumerate() { *value = *(&(*self.buffers)) @@ -212,10 +206,7 @@ impl<'slice, 'sample> ChannelSamples<'slice, 'sample> { #[cfg(feature = "simd")] #[allow(clippy::wrong_self_convention)] #[inline] - pub fn from_simd(&mut self, vector: Simd) - where - LaneCount: SupportedLaneCount, - { + pub fn from_simd(&mut self, vector: Simd) { let used_lanes = self.len().max(LANES); let values = vector.to_array(); for (channel_idx, value) in values.into_iter().enumerate().take(used_lanes) { @@ -236,10 +227,7 @@ impl<'slice, 'sample> ChannelSamples<'slice, 'sample> { #[cfg(feature = "simd")] #[allow(clippy::wrong_self_convention)] #[inline] - pub unsafe fn from_simd_unchecked(&mut self, vector: Simd) - where - LaneCount: SupportedLaneCount, - { + pub unsafe fn from_simd_unchecked(&mut self, vector: Simd) { let values = vector.to_array(); for (channel_idx, value) in values.into_iter().enumerate() { *(&mut (*self.buffers))