Update for SIMD changes (#1725)

Author: dhardy

src/distr/integer.rs

@@ -159,10 +159,7 @@ macro_rules! simd_impl {
         ///
         /// [`simd_support`]: https://github.com/rust-random/rand#crate-features
         #[cfg(feature = "simd_support")]
-        impl<const LANES: usize> Distribution<Simd<$ty, LANES>> for StandardUniform
-        where
-            LaneCount<LANES>: SupportedLaneCount,
-        {
+        impl<const LANES: usize> Distribution<Simd<$ty, LANES>> for StandardUniform {
             #[inline]
             fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> Simd<$ty, LANES> {
                 let mut vec = Simd::default();

src/distr/other.rs

@@ -20,9 +20,9 @@ use crate::distr::{Distribution, StandardUniform, Uniform};
 use crate::{Rng, RngExt};
 
 #[cfg(feature = "simd_support")]
-use core::simd::prelude::*;
+use core::simd::MaskElement;
 #[cfg(feature = "simd_support")]
-use core::simd::{LaneCount, MaskElement, SupportedLaneCount};
+use core::simd::prelude::*;
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 
@@ -234,7 +234,6 @@ impl Distribution<bool> for StandardUniform {
 impl<T, const LANES: usize> Distribution<Mask<T, LANES>> for StandardUniform
 where
     T: MaskElement + Default,
-    LaneCount<LANES>: SupportedLaneCount,
     StandardUniform: Distribution<Simd<T, LANES>>,
     Simd<T, LANES>: SimdPartialOrd<Mask = Mask<T, LANES>>,
 {

src/distr/uniform_float.rs

@@ -16,8 +16,6 @@ use crate::{Rng, RngExt};
 
 #[cfg(feature = "simd_support")]
 use core::simd::prelude::*;
-// #[cfg(feature = "simd_support")]
-// use core::simd::{LaneCount, SupportedLaneCount};
 
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};

src/distr/uniform_int.rs

@@ -16,9 +16,7 @@ use crate::distr::{Distribution, StandardUniform};
 use crate::{Rng, RngExt};
 
 #[cfg(feature = "simd_support")]
-use core::simd::prelude::*;
-#[cfg(feature = "simd_support")]
-use core::simd::{LaneCount, SupportedLaneCount};
+use core::simd::{Select, prelude::*};
 
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
@@ -283,7 +281,6 @@ macro_rules! uniform_simd_int_impl {
         #[cfg(feature = "simd_support")]
         impl<const LANES: usize> SampleUniform for Simd<$ty, LANES>
         where
-            LaneCount<LANES>: SupportedLaneCount,
             Simd<$unsigned, LANES>:
                 WideningMultiply<Output = (Simd<$unsigned, LANES>, Simd<$unsigned, LANES>)>,
             StandardUniform: Distribution<Simd<$unsigned, LANES>>,
@@ -294,7 +291,6 @@ macro_rules! uniform_simd_int_impl {
         #[cfg(feature = "simd_support")]
         impl<const LANES: usize> UniformSampler for UniformInt<Simd<$ty, LANES>>
         where
-            LaneCount<LANES>: SupportedLaneCount,
             Simd<$unsigned, LANES>:
                 WideningMultiply<Output = (Simd<$unsigned, LANES>, Simd<$unsigned, LANES>)>,
             StandardUniform: Distribution<Simd<$unsigned, LANES>>,

src/distr/utils.rs

@@ -9,9 +9,9 @@
 //! Math helper functions
 
 #[cfg(feature = "simd_support")]
-use core::simd::prelude::*;
+use core::simd::SimdElement;
 #[cfg(feature = "simd_support")]
-use core::simd::{LaneCount, SimdElement, SupportedLaneCount};
+use core::simd::prelude::*;
 
 pub(crate) trait WideningMultiply<RHS = Self> {
     type Output;
@@ -337,10 +337,7 @@ scalar_float_impl!(f64, u64);
 #[cfg(feature = "simd_support")]
 macro_rules! simd_impl {
     ($fty:ident, $uty:ident) => {
-        impl<const LANES: usize> FloatSIMDUtils for Simd<$fty, LANES>
-        where
-            LaneCount<LANES>: SupportedLaneCount,
-        {
+        impl<const LANES: usize> FloatSIMDUtils for Simd<$fty, LANES> {
             type Mask = Mask<<$fty as SimdElement>::Mask, LANES>;
             type UInt = Simd<$uty, LANES>;
 
@@ -373,7 +370,7 @@ macro_rules! simd_impl {
                 // value representable by $fty. This works even when the
                 // current value is infinity.
                 debug_assert!(mask.any(), "At least one lane must be set");
-                Self::from_bits(self.to_bits() + mask.to_int().cast())
+                Self::from_bits(self.to_bits() + mask.to_simd().cast())
             }
 
             #[inline]
@@ -383,10 +380,7 @@ macro_rules! simd_impl {
         }
 
         #[cfg(test)]
-        impl<const LANES: usize> FloatSIMDScalarUtils for Simd<$fty, LANES>
-        where
-            LaneCount<LANES>: SupportedLaneCount,
-        {
+        impl<const LANES: usize> FloatSIMDScalarUtils for Simd<$fty, LANES> {
             type Scalar = $fty;
 
             #[inline]