refactor: treat macro visibility like other items

src/distribution/bernoulli.rs

@@ -272,9 +272,9 @@ impl Discrete<u64, f64> for Bernoulli {
 
 #[rustfmt::skip]
 #[cfg(test)]
-mod testing {
+mod test {
     use super::*;
-    use crate::testing_boiler;
+    use crate::distribution::internal::testing_boiler;
 
     testing_boiler!(p: f64; Bernoulli; BinomialError);
 

src/distribution/beta.rs

@@ -384,14 +384,12 @@ impl Continuous<f64, f64> for Beta {
     }
 }
 
-#[rustfmt::skip]
 #[cfg(test)]
 mod tests {
     use super::*;
-    use super::super::internal::*;
-    use crate::testing_boiler;
+    use crate::distribution::internal::density_util;
 
-    testing_boiler!(a: f64, b: f64; Beta; BetaError);
+    crate::distribution::internal::testing_boiler!(a: f64, b: f64; Beta; BetaError);
 
     #[test]
     fn test_create() {
@@ -506,7 +504,7 @@ mod tests {
             ((5.0, 100.0), 0.0, 0.0),
             ((5.0, 100.0), 0.5, 4.534102298350337661e-23),
             ((5.0, 100.0), 1.0, 0.0),
-            ((5.0, 100.0), 1.0, 0.0)
+            ((5.0, 100.0), 1.0, 0.0),
         ];
         for ((a, b), x, expect) in test {
             test_relative(a, b, expect, f(x));
@@ -611,8 +609,8 @@ mod tests {
             ((5.0, 100.0), 1.0, 1.0),
         ];
         for ((a, b), x, expect) in test {
-           test_relative(a, b, expect, func(x));
-        };
+            test_relative(a, b, expect, func(x));
+        }
     }
 
     #[test]
@@ -641,7 +639,7 @@ mod tests {
 
     #[test]
     fn test_continuous() {
-        test::check_continuous_distribution(&create_ok(1.2, 3.4), 0.0, 1.0);
-        test::check_continuous_distribution(&create_ok(4.5, 6.7), 0.0, 1.0);
+        density_util::check_continuous_distribution(&create_ok(1.2, 3.4), 0.0, 1.0);
+        density_util::check_continuous_distribution(&create_ok(4.5, 6.7), 0.0, 1.0);
     }
 }

src/distribution/binomial.rs

@@ -357,10 +357,8 @@ impl Discrete<u64, f64> for Binomial {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::distribution::internal::*;
-    use crate::testing_boiler;
-
-    testing_boiler!(p: f64, n: u64; Binomial; BinomialError);
+    use crate::distribution::internal::density_util;
+    crate::distribution::internal::testing_boiler!(p: f64, n: u64; Binomial; BinomialError);
 
     #[test]
     fn test_create() {
@@ -580,7 +578,7 @@ mod tests {
 
     #[test]
     fn test_discrete() {
-        test::check_discrete_distribution(&create_ok(0.3, 5), 5);
-        test::check_discrete_distribution(&create_ok(0.7, 10), 10);
+        density_util::check_discrete_distribution(&create_ok(0.3, 5), 5);
+        density_util::check_discrete_distribution(&create_ok(0.7, 10), 10);
     }
 }

src/distribution/categorical.rs

@@ -410,8 +410,8 @@ fn test_binary_index() {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::distribution::internal::*;
-    use crate::testing_boiler;
+    use crate::distribution::internal::density_util;
+    use crate::distribution::internal::testing_boiler;
 
     testing_boiler!(prob_mass: &[f64]; Categorical; CategoricalError);
 
@@ -575,7 +575,7 @@ mod tests {
 
     #[test]
     fn test_discrete() {
-        test::check_discrete_distribution(&create_ok(&[1.0, 2.0, 3.0, 4.0]), 4);
-        test::check_discrete_distribution(&create_ok(&[0.0, 1.0, 2.0, 3.0, 4.0]), 5);
+        density_util::check_discrete_distribution(&create_ok(&[1.0, 2.0, 3.0, 4.0]), 4);
+        density_util::check_discrete_distribution(&create_ok(&[0.0, 1.0, 2.0, 3.0, 4.0]), 5);
     }
 }

src/distribution/cauchy.rs

@@ -280,10 +280,8 @@ impl Continuous<f64, f64> for Cauchy {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::distribution::internal::*;
-    use crate::testing_boiler;
-
-    testing_boiler!(location: f64, scale: f64; Cauchy; CauchyError);
+    use crate::distribution::internal::density_util;
+    crate::distribution::internal::testing_boiler!(location: f64, scale: f64; Cauchy; CauchyError);
 
     #[test]
     fn test_create() {
@@ -513,7 +511,7 @@ mod tests {
 
     #[test]
     fn test_continuous() {
-        test::check_continuous_distribution(&create_ok(-1.2, 3.4), -1500.0, 1500.0);
-        test::check_continuous_distribution(&create_ok(-4.5, 6.7), -5000.0, 5000.0);
+        density_util::check_continuous_distribution(&create_ok(-1.2, 3.4), -1500.0, 1500.0);
+        density_util::check_continuous_distribution(&create_ok(-4.5, 6.7), -5000.0, 5000.0);
     }
 }

src/distribution/chi.rs

@@ -338,10 +338,8 @@ impl Continuous<f64, f64> for Chi {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::distribution::internal::*;
-    use crate::testing_boiler;
-
-    testing_boiler!(freedom: u64; Chi; ChiError);
+    use crate::distribution::internal::density_util;
+    crate::distribution::internal::testing_boiler!(freedom: u64; Chi; ChiError);
 
     #[test]
     fn test_create() {
@@ -510,8 +508,8 @@ mod tests {
 
     #[test]
     fn test_continuous() {
-        test::check_continuous_distribution(&create_ok(1), 0.0, 10.0);
-        test::check_continuous_distribution(&create_ok(2), 0.0, 10.0);
-        test::check_continuous_distribution(&create_ok(5), 0.0, 10.0);
+        density_util::check_continuous_distribution(&create_ok(1), 0.0, 10.0);
+        density_util::check_continuous_distribution(&create_ok(2), 0.0, 10.0);
+        density_util::check_continuous_distribution(&create_ok(5), 0.0, 10.0);
     }
 }

src/distribution/chi_squared.rs

@@ -307,10 +307,8 @@ impl Continuous<f64, f64> for ChiSquared {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::distribution::internal::*;
-    use crate::testing_boiler;
-
-    testing_boiler!(freedom: f64; ChiSquared; GammaError);
+    use crate::distribution::internal::density_util;
+    crate::distribution::internal::testing_boiler!(freedom: f64; ChiSquared; GammaError);
 
     #[test]
     fn test_median() {
@@ -325,8 +323,8 @@ mod tests {
     #[test]
     fn test_continuous() {
         // TODO: figure out why this test fails:
-        //test::check_continuous_distribution(&create_ok(1.0), 0.0, 10.0);
-        test::check_continuous_distribution(&create_ok(2.0), 0.0, 10.0);
-        test::check_continuous_distribution(&create_ok(5.0), 0.0, 50.0);
+        //check_continuous_distribution(&create_ok(1.0), 0.0, 10.0);
+        density_util::check_continuous_distribution(&create_ok(2.0), 0.0, 10.0);
+        density_util::check_continuous_distribution(&create_ok(5.0), 0.0, 50.0);
     }
 }

src/distribution/dirac.rs

@@ -213,7 +213,7 @@ impl Mode<Option<f64>> for Dirac {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::testing_boiler;
+    use crate::distribution::internal::testing_boiler;
 
     testing_boiler!(v: f64; Dirac; DiracError);
 

src/distribution/discrete_uniform.rs

@@ -284,7 +284,7 @@ impl Discrete<i64, f64> for DiscreteUniform {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::testing_boiler;
+    use crate::distribution::internal::testing_boiler;
 
     testing_boiler!(min: i64, max: i64; DiscreteUniform; DiscreteUniformError);
 

src/distribution/erlang.rs

@@ -294,9 +294,8 @@ impl Continuous<f64, f64> for Erlang {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::distribution::internal::*;
-    use crate::testing_boiler;
-
+    use crate::distribution::internal::density_util;
+    use crate::distribution::internal::testing_boiler;
     testing_boiler!(shape: u64, rate: f64; Erlang; GammaError);
 
     #[test]
@@ -324,8 +323,8 @@ mod tests {
 
     #[test]
     fn test_continuous() {
-        test::check_continuous_distribution(&create_ok(1, 2.5), 0.0, 20.0);
-        test::check_continuous_distribution(&create_ok(2, 1.5), 0.0, 20.0);
-        test::check_continuous_distribution(&create_ok(3, 0.5), 0.0, 20.0);
+        density_util::check_continuous_distribution(&create_ok(1, 2.5), 0.0, 20.0);
+        density_util::check_continuous_distribution(&create_ok(2, 1.5), 0.0, 20.0);
+        density_util::check_continuous_distribution(&create_ok(3, 0.5), 0.0, 20.0);
     }
 }

src/distribution/exponential.rs

@@ -301,8 +301,8 @@ impl Continuous<f64, f64> for Exp {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::distribution::internal::*;
-    use crate::testing_boiler;
+    use crate::distribution::internal::density_util;
+    use crate::distribution::internal::testing_boiler;
 
     testing_boiler!(rate: f64; Exp; ExpError);
 
@@ -504,8 +504,8 @@ mod tests {
 
     #[test]
     fn test_continuous() {
-        test::check_continuous_distribution(&create_ok(0.5), 0.0, 10.0);
-        test::check_continuous_distribution(&create_ok(1.5), 0.0, 20.0);
-        test::check_continuous_distribution(&create_ok(2.5), 0.0, 50.0);
+        density_util::check_continuous_distribution(&create_ok(0.5), 0.0, 10.0);
+        density_util::check_continuous_distribution(&create_ok(1.5), 0.0, 20.0);
+        density_util::check_continuous_distribution(&create_ok(2.5), 0.0, 50.0);
     }
 }

src/distribution/fisher_snedecor.rs

@@ -416,8 +416,8 @@ impl Continuous<f64, f64> for FisherSnedecor {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::distribution::internal::*;
-    use crate::testing_boiler;
+    use crate::distribution::internal::density_util;
+    use crate::distribution::internal::testing_boiler;
 
     testing_boiler!(freedom_1: f64, freedom_2: f64; FisherSnedecor; FisherSnedecorError);
 
@@ -620,6 +620,6 @@ mod tests {
 
     #[test]
     fn test_continuous() {
-        test::check_continuous_distribution(&create_ok(10.0, 10.0), 0.0, 10.0);
+        density_util::check_continuous_distribution(&create_ok(10.0, 10.0), 0.0, 10.0);
     }
 }

src/distribution/gamma.rs

@@ -438,8 +438,8 @@ pub fn sample_unchecked<R: ::rand::Rng + ?Sized>(rng: &mut R, shape: f64, rate:
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::distribution::internal::*;
-    use crate::testing_boiler;
+    use crate::distribution::internal::density_util;
+    use crate::distribution::internal::testing_boiler;
 
     testing_boiler!(shape: f64, rate: f64; Gamma; GammaError);
 
@@ -708,7 +708,7 @@ mod tests {
 
     #[test]
     fn test_continuous() {
-        test::check_continuous_distribution(&create_ok(1.0, 0.5), 0.0, 20.0);
-        test::check_continuous_distribution(&create_ok(9.0, 2.0), 0.0, 20.0);
+        density_util::check_continuous_distribution(&create_ok(1.0, 0.5), 0.0, 20.0);
+        density_util::check_continuous_distribution(&create_ok(9.0, 2.0), 0.0, 20.0);
     }
 }

src/distribution/geometric.rs

@@ -304,11 +304,10 @@ impl Discrete<u64, f64> for Geometric {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::distribution::internal::density_util;
     use crate::prec;
-    use crate::distribution::internal::*;
-    use crate::testing_boiler;
 
-    testing_boiler!(p: f64; Geometric; GeometricError);
+    crate::distribution::internal::testing_boiler!(p: f64; Geometric; GeometricError);
 
     #[test]
     fn test_create() {
@@ -508,8 +507,8 @@ mod tests {
 
     #[test]
     fn test_discrete() {
-        test::check_discrete_distribution(&create_ok(0.3), 100);
-        test::check_discrete_distribution(&create_ok(0.6), 100);
-        test::check_discrete_distribution(&create_ok(1.0), 1);
+        density_util::check_discrete_distribution(&create_ok(0.3), 100);
+        density_util::check_discrete_distribution(&create_ok(0.6), 100);
+        density_util::check_discrete_distribution(&create_ok(1.0), 1);
     }
 }

src/distribution/gumbel.rs

@@ -339,7 +339,7 @@ impl Continuous<f64, f64> for Gumbel {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::testing_boiler;
+    use crate::distribution::internal::testing_boiler;
 
     testing_boiler!(location: f64, scale: f64; Gumbel; GumbelError);
 

src/distribution/hypergeometric.rs

@@ -424,8 +424,8 @@ impl Discrete<u64, f64> for Hypergeometric {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::distribution::internal::*;
-    use crate::testing_boiler;
+    use crate::distribution::internal::density_util;
+    use crate::distribution::internal::testing_boiler;
 
     testing_boiler!(population: u64, successes: u64, draws: u64; Hypergeometric; HypergeometricError);
 
@@ -596,7 +596,7 @@ mod tests {
 
     #[test]
     fn test_discrete() {
-        test::check_discrete_distribution(&create_ok(5, 4, 3), 4);
-        test::check_discrete_distribution(&create_ok(3, 2, 1), 2);
+        density_util::check_discrete_distribution(&create_ok(5, 4, 3), 4);
+        density_util::check_discrete_distribution(&create_ok(3, 2, 1), 2);
     }
 }