rustfmt: where clauses and super traits

Author: dhardy

rand_chacha/src/chacha.rs

@@ -20,7 +20,9 @@ const STREAM_PARAM_NONCE: u32 = 1;
 const STREAM_PARAM_BLOCK: u32 = 0;
 
 pub struct Array64<T>([T; 64]);
-impl<T> Default for Array64<T> where T: Default {
+impl<T> Default for Array64<T>
+where T: Default
+{
     fn default() -> Self {
         Self([T::default(), T::default(), T::default(), T::default(), T::default(), T::default(), T::default(), T::default(),
               T::default(), T::default(), T::default(), T::default(), T::default(), T::default(), T::default(), T::default(),
@@ -42,7 +44,9 @@ impl<T> AsMut<[T]> for Array64<T> {
         &mut self.0
     }
 }
-impl<T> Clone for Array64<T> where T: Copy + Default {
+impl<T> Clone for Array64<T>
+where T: Copy + Default
+{
     fn clone(&self) -> Self {
         let mut new = Self::default();
         new.0.copy_from_slice(&self.0);

rand_core/src/error.rs

@@ -33,8 +33,7 @@ impl Error {
     #[cfg(feature = "std")]
     #[inline]
     pub fn new<E>(err: E) -> Self
-    where E: Into<Box<dyn std::error::Error + Send + Sync + 'static>>
-    {
+    where E: Into<Box<dyn std::error::Error + Send + Sync + 'static>> {
         Error { inner: err.into() }
     }
 

rand_distr/src/dirichlet.rs

@@ -61,7 +61,10 @@ impl fmt::Display for Error {
 impl error::Error for Error {}
 
 impl<N: Float> Dirichlet<N>
-where StandardNormal: Distribution<N>, Exp1: Distribution<N>, Open01: Distribution<N>
+where
+    StandardNormal: Distribution<N>,
+    Exp1: Distribution<N>,
+    Open01: Distribution<N>,
 {
     /// Construct a new `Dirichlet` with the given alpha parameter `alpha`.
     ///
@@ -99,7 +102,10 @@ where StandardNormal: Distribution<N>, Exp1: Distribution<N>, Open01: Distributi
 }
 
 impl<N: Float> Distribution<Vec<N>> for Dirichlet<N>
-where StandardNormal: Distribution<N>, Exp1: Distribution<N>, Open01: Distribution<N>
+where
+    StandardNormal: Distribution<N>,
+    Exp1: Distribution<N>,
+    Open01: Distribution<N>,
 {
     fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> Vec<N> {
         let n = self.alpha.len();

rand_distr/src/gamma.rs

@@ -115,7 +115,10 @@ struct GammaLargeShape<N> {
 }
 
 impl<N: Float> Gamma<N>
-where StandardNormal: Distribution<N>, Exp1: Distribution<N>, Open01: Distribution<N>
+where
+    StandardNormal: Distribution<N>,
+    Exp1: Distribution<N>,
+    Open01: Distribution<N>,
 {
     /// Construct an object representing the `Gamma(shape, scale)`
     /// distribution.
@@ -140,7 +143,9 @@ where StandardNormal: Distribution<N>, Exp1: Distribution<N>, Open01: Distributi
 }
 
 impl<N: Float> GammaSmallShape<N>
-where StandardNormal: Distribution<N>, Open01: Distribution<N>
+where
+    StandardNormal: Distribution<N>,
+    Open01: Distribution<N>,
 {
     fn new_raw(shape: N, scale: N) -> GammaSmallShape<N> {
         GammaSmallShape {
@@ -151,7 +156,9 @@ where StandardNormal: Distribution<N>, Open01: Distribution<N>
 }
 
 impl<N: Float> GammaLargeShape<N>
-where StandardNormal: Distribution<N>, Open01: Distribution<N>
+where
+    StandardNormal: Distribution<N>,
+    Open01: Distribution<N>,
 {
     fn new_raw(shape: N, scale: N) -> GammaLargeShape<N> {
         let d = shape - N::from(1. / 3.);
@@ -164,7 +171,10 @@ where StandardNormal: Distribution<N>, Open01: Distribution<N>
 }
 
 impl<N: Float> Distribution<N> for Gamma<N>
-where StandardNormal: Distribution<N>, Exp1: Distribution<N>, Open01: Distribution<N>
+where
+    StandardNormal: Distribution<N>,
+    Exp1: Distribution<N>,
+    Open01: Distribution<N>,
 {
     fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> N {
         match self.repr {
@@ -175,7 +185,9 @@ where StandardNormal: Distribution<N>, Exp1: Distribution<N>, Open01: Distributi
     }
 }
 impl<N: Float> Distribution<N> for GammaSmallShape<N>
-where StandardNormal: Distribution<N>, Open01: Distribution<N>
+where
+    StandardNormal: Distribution<N>,
+    Open01: Distribution<N>,
 {
     fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> N {
         let u: N = rng.sample(Open01);
@@ -184,7 +196,9 @@ where StandardNormal: Distribution<N>, Open01: Distribution<N>
     }
 }
 impl<N: Float> Distribution<N> for GammaLargeShape<N>
-where StandardNormal: Distribution<N>, Open01: Distribution<N>
+where
+    StandardNormal: Distribution<N>,
+    Open01: Distribution<N>,
 {
     fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> N {
         // Marsaglia & Tsang method, 2000
@@ -259,7 +273,10 @@ enum ChiSquaredRepr<N> {
 }
 
 impl<N: Float> ChiSquared<N>
-where StandardNormal: Distribution<N>, Exp1: Distribution<N>, Open01: Distribution<N>
+where
+    StandardNormal: Distribution<N>,
+    Exp1: Distribution<N>,
+    Open01: Distribution<N>,
 {
     /// Create a new chi-squared distribution with degrees-of-freedom
     /// `k`.
@@ -276,7 +293,10 @@ where StandardNormal: Distribution<N>, Exp1: Distribution<N>, Open01: Distributi
     }
 }
 impl<N: Float> Distribution<N> for ChiSquared<N>
-where StandardNormal: Distribution<N>, Exp1: Distribution<N>, Open01: Distribution<N>
+where
+    StandardNormal: Distribution<N>,
+    Exp1: Distribution<N>,
+    Open01: Distribution<N>,
 {
     fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> N {
         match self.repr {
@@ -335,7 +355,10 @@ impl fmt::Display for FisherFError {
 impl error::Error for FisherFError {}
 
 impl<N: Float> FisherF<N>
-where StandardNormal: Distribution<N>, Exp1: Distribution<N>, Open01: Distribution<N>
+where
+    StandardNormal: Distribution<N>,
+    Exp1: Distribution<N>,
+    Open01: Distribution<N>,
 {
     /// Create a new `FisherF` distribution, with the given parameter.
     pub fn new(m: N, n: N) -> Result<FisherF<N>, FisherFError> {
@@ -354,7 +377,10 @@ where StandardNormal: Distribution<N>, Exp1: Distribution<N>, Open01: Distributi
     }
 }
 impl<N: Float> Distribution<N> for FisherF<N>
-where StandardNormal: Distribution<N>, Exp1: Distribution<N>, Open01: Distribution<N>
+where
+    StandardNormal: Distribution<N>,
+    Exp1: Distribution<N>,
+    Open01: Distribution<N>,
 {
     fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> N {
         self.numer.sample(rng) / self.denom.sample(rng) * self.dof_ratio
@@ -380,7 +406,10 @@ pub struct StudentT<N> {
 }
 
 impl<N: Float> StudentT<N>
-where StandardNormal: Distribution<N>, Exp1: Distribution<N>, Open01: Distribution<N>
+where
+    StandardNormal: Distribution<N>,
+    Exp1: Distribution<N>,
+    Open01: Distribution<N>,
 {
     /// Create a new Student t distribution with `n` degrees of
     /// freedom.
@@ -392,7 +421,10 @@ where StandardNormal: Distribution<N>, Exp1: Distribution<N>, Open01: Distributi
     }
 }
 impl<N: Float> Distribution<N> for StudentT<N>
-where StandardNormal: Distribution<N>, Exp1: Distribution<N>, Open01: Distribution<N>
+where
+    StandardNormal: Distribution<N>,
+    Exp1: Distribution<N>,
+    Open01: Distribution<N>,
 {
     fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> N {
         let norm: N = rng.sample(StandardNormal);
@@ -438,7 +470,10 @@ impl fmt::Display for BetaError {
 impl error::Error for BetaError {}
 
 impl<N: Float> Beta<N>
-where StandardNormal: Distribution<N>, Exp1: Distribution<N>, Open01: Distribution<N>
+where
+    StandardNormal: Distribution<N>,
+    Exp1: Distribution<N>,
+    Open01: Distribution<N>,
 {
     /// Construct an object representing the `Beta(alpha, beta)`
     /// distribution.
@@ -453,7 +488,10 @@ where StandardNormal: Distribution<N>, Exp1: Distribution<N>, Open01: Distributi
 }
 
 impl<N: Float> Distribution<N> for Beta<N>
-where StandardNormal: Distribution<N>, Exp1: Distribution<N>, Open01: Distribution<N>
+where
+    StandardNormal: Distribution<N>,
+    Exp1: Distribution<N>,
+    Open01: Distribution<N>,
 {
     fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> N {
         let x = self.gamma_a.sample(rng);

rand_distr/src/pert.rs

@@ -61,7 +61,10 @@ impl fmt::Display for PertError {
 impl error::Error for PertError {}
 
 impl<N: Float> Pert<N>
-where StandardNormal: Distribution<N>, Exp1: Distribution<N>, Open01: Distribution<N>
+where
+    StandardNormal: Distribution<N>,
+    Exp1: Distribution<N>,
+    Open01: Distribution<N>,
 {
     /// Set up the PERT distribution with defined `min`, `max` and `mode`.
     ///
@@ -99,7 +102,10 @@ where StandardNormal: Distribution<N>, Exp1: Distribution<N>, Open01: Distributi
 }
 
 impl<N: Float> Distribution<N> for Pert<N>
-where StandardNormal: Distribution<N>, Exp1: Distribution<N>, Open01: Distribution<N>
+where
+    StandardNormal: Distribution<N>,
+    Exp1: Distribution<N>,
+    Open01: Distribution<N>,
 {
     #[inline]
     fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> N {

rand_distr/src/utils.rs

@@ -21,13 +21,19 @@ use rand::Rng;
 ///
 /// The bounds and methods are based purely on internal
 /// requirements, and will change as needed.
-pub trait Float: Copy + Sized + cmp::PartialOrd
+pub trait Float:
+    Copy
+    + Sized
+    + cmp::PartialOrd
     + ops::Neg<Output = Self>
     + ops::Add<Output = Self>
     + ops::Sub<Output = Self>
     + ops::Mul<Output = Self>
     + ops::Div<Output = Self>
-    + ops::AddAssign + ops::SubAssign + ops::MulAssign + ops::DivAssign
+    + ops::AddAssign
+    + ops::SubAssign
+    + ops::MulAssign
+    + ops::DivAssign
 {
     /// The constant π
     fn pi() -> Self;

src/distributions/integer.rs

@@ -187,11 +187,8 @@ mod tests {
 
     #[test]
     fn value_stability() {
-        fn test_samples<T: Copy + core::fmt::Debug + PartialEq>(
-            zero: T, expected: &[T]
-        )
-        where Standard: Distribution<T>
-        {
+        fn test_samples<T: Copy + core::fmt::Debug + PartialEq>(zero: T, expected: &[T])
+        where Standard: Distribution<T> {
             let mut rng = crate::test::rng(807);
             let mut buf = [zero; 3];
             for x in &mut buf {

src/distributions/mod.rs

@@ -220,7 +220,9 @@ pub trait Distribution<T> {
     /// }
     /// ```
     fn sample_iter<R>(self, rng: R) -> DistIter<Self, R, T>
-    where R: Rng, Self: Sized
+    where
+        R: Rng,
+        Self: Sized,
     {
         DistIter {
             distr: self,
@@ -252,7 +254,9 @@ pub struct DistIter<D, R, T> {
 }
 
 impl<D, R, T> Iterator for DistIter<D, R, T>
-    where D: Distribution<T>, R: Rng
+where
+    D: Distribution<T>,
+    R: Rng,
 {
     type Item = T;
 
@@ -270,11 +274,19 @@ impl<D, R, T> Iterator for DistIter<D, R, T>
 }
 
 impl<D, R, T> iter::FusedIterator for DistIter<D, R, T>
-    where D: Distribution<T>, R: Rng {}
+where
+    D: Distribution<T>,
+    R: Rng,
+{
+}
 
 #[cfg(features = "nightly")]
 impl<D, R, T> iter::TrustedLen for DistIter<D, R, T>
-    where D: Distribution<T>, R: Rng {}
+where
+    D: Distribution<T>,
+    R: Rng,
+{
+}
 
 
 /// A generic random value distribution, implemented for many primitive types.

src/distributions/other.rs

@@ -155,7 +155,9 @@ macro_rules! array_impl {
 
 array_impl! {32, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T,}
 
-impl<T> Distribution<Option<T>> for Standard where Standard: Distribution<T> {
+impl<T> Distribution<Option<T>> for Standard
+where Standard: Distribution<T>
+{
     #[inline]
     fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> Option<T> {
         // UFCS is needed here: https://github.com/rust-lang/rust/issues/24066
@@ -167,7 +169,9 @@ impl<T> Distribution<Option<T>> for Standard where Standard: Distribution<T> {
     }
 }
 
-impl<T> Distribution<Wrapping<T>> for Standard where Standard: Distribution<T> {
+impl<T> Distribution<Wrapping<T>> for Standard
+where Standard: Distribution<T>
+{
     #[inline]
     fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> Wrapping<T> {
         Wrapping(rng.gen())