Move tests into main crate (#36)

Cargo.toml

@@ -2,8 +2,7 @@
 
 members = [
     "typed_floats",
-    "typed_floats_macros",
-    "typed_floats_tests",
+    "typed_floats_macros"
 ]
 
 resolver = "2"

README.md

@@ -129,8 +129,6 @@ Methods that takes another float as parameter will also return the most strict t
 
 Tests are run on different architectures on [GitHub actions](https://github.com/tdelmas/typed_floats/actions/workflows/tests.yml) and [CircleCI](https://circleci.com/gh/tdelmas/typed_floats).
 
-A separate crate is handling exaustive testing: `typed_floats_test`. They are not included in the published crates because they use >1GB of disk and take >10 minutes to run.
-
 To run all tests:
 
 ```bash

tag.rs

@@ -107,11 +107,6 @@ fn main() {
         &new_version,
         "./typed_floats_macros/Cargo.toml",
     );
-    update_version(
-        &crate_version,
-        &new_version,
-        "./typed_floats_tests/Cargo.toml",
-    );
 
     //build
     std::process::Command::new("cargo")
@@ -126,7 +121,6 @@ fn main() {
             "add",
             "./typed_floats/Cargo.toml",
             "./typed_floats_macros/Cargo.toml",
-            "./typed_floats_tests/Cargo.toml",
             "./Cargo.lock"
         ])
         .output()

typed_floats/Cargo.toml

@@ -18,6 +18,10 @@ rust-version = "1.56"
 [features]
 default = []
 
+#[lib]
+#name = "typed_floats"
+#path = "src/lib.rs"
+
 [dependencies]
 thiserror = "1.0"
 typed_floats_macros = {version = "=0.2.4", path = "../typed_floats_macros"}

typed_floats/src/lib.rs

@@ -389,7 +389,6 @@ pub trait DivEuclid<T> {
     fn div_euclid(self, rhs: T) -> Self::Output;
 }
 
-
 /// This trait is used to specify the return type of the [`Atan2::atan2()`] function.
 pub trait Atan2<T> {
     /// The resulting type after applying [`Atan2::atan2()`].
@@ -408,7 +407,7 @@ pub trait Atan2<T> {
     /// # use typed_floats::*;
     /// use typed_floats::tf64::NonNaN;
     /// use typed_floats::tf64::consts::FRAC_PI_4;
-    /// 
+    ///
     /// // Positive angles measured counter-clockwise
     /// // from positive x axis
     /// // -pi/4 radians (45 deg clockwise)
@@ -422,7 +421,7 @@ pub trait Atan2<T> {
     /// assert_relative_eq!(y1.atan2(x1), -std::f64::consts::FRAC_PI_4);
     /// assert_relative_eq!(y2.atan2(x2), 3.0 * std::f64::consts::FRAC_PI_4);
     /// ```
-    /// 
+    ///
     /// See [`f64::atan2()`] for more details.
     fn atan2(self, rhs: T) -> Self::Output;
 }

typed_floats/tests/abs.rs

@@ -0,0 +1,3 @@
+use typed_floats::*;
+
+typed_floats_macros::generate_tests_self!(abs);

typed_floats/tests/acos.rs

@@ -0,0 +1,3 @@
+use typed_floats::*;
+
+typed_floats_macros::generate_tests_self!(acos);

typed_floats/tests/acosh.rs

@@ -0,0 +1,3 @@
+use typed_floats::*;
+
+typed_floats_macros::generate_tests_self!(acosh);

typed_floats/tests/add.rs

@@ -0,0 +1,3 @@
+use typed_floats::*;
+
+typed_floats_macros::generate_tests_self_rhs!(add);

typed_floats/tests/asin.rs

@@ -0,0 +1,3 @@
+use typed_floats::*;
+
+typed_floats_macros::generate_tests_self!(asin);

typed_floats/tests/asinh.rs

@@ -0,0 +1,3 @@
+use typed_floats::*;
+
+typed_floats_macros::generate_tests_self!(asinh);

typed_floats/tests/atan.rs

@@ -0,0 +1,3 @@
+use typed_floats::*;
+
+typed_floats_macros::generate_tests_self!(atan);

typed_floats/tests/atan2.rs

@@ -0,0 +1,3 @@
+use typed_floats::*;
+
+typed_floats_macros::generate_tests_self_rhs!(atan2);

typed_floats/tests/atanh.rs

@@ -0,0 +1,3 @@
+use typed_floats::*;
+
+typed_floats_macros::generate_tests_self!(atanh);

typed_floats/tests/cbrt.rs

@@ -0,0 +1,3 @@
+use typed_floats::*;
+
+typed_floats_macros::generate_tests_self!(cbrt);

typed_floats/tests/ceil.rs

@@ -0,0 +1,3 @@
+use typed_floats::*;
+
+typed_floats_macros::generate_tests_self!(ceil);

typed_floats/tests/copysign.rs

@@ -0,0 +1,3 @@
+use typed_floats::*;
+
+typed_floats_macros::generate_tests_self_rhs!(copysign);

typed_floats/tests/cos.rs

@@ -0,0 +1,3 @@
+use typed_floats::*;
+
+typed_floats_macros::generate_tests_self!(cos);

typed_floats/tests/cosh.rs

@@ -0,0 +1,3 @@
+use typed_floats::*;
+
+typed_floats_macros::generate_tests_self!(cosh);

typed_floats/tests/div.rs

@@ -0,0 +1,3 @@
+use typed_floats::*;
+
+typed_floats_macros::generate_tests_self_rhs!(div);

typed_floats/tests/div_euclid.rs

@@ -0,0 +1,3 @@
+use typed_floats::*;
+
+typed_floats_macros::generate_tests_self_rhs!(div_euclid);

typed_floats/tests/exp.rs

@@ -0,0 +1,3 @@
+use typed_floats::*;
+
+typed_floats_macros::generate_tests_self!(exp);

typed_floats/tests/exp2.rs

@@ -0,0 +1,3 @@
+use typed_floats::*;
+
+typed_floats_macros::generate_tests_self!(exp2);

typed_floats/tests/exp_m1.rs

@@ -0,0 +1,3 @@
+use typed_floats::*;
+
+typed_floats_macros::generate_tests_self!(exp_m1);

typed_floats/tests/floor.rs

@@ -0,0 +1,3 @@
+use typed_floats::*;
+
+typed_floats_macros::generate_tests_self!(floor);

typed_floats/tests/fract.rs

@@ -0,0 +1,3 @@
+use typed_floats::*;
+
+typed_floats_macros::generate_tests_self!(fract);

typed_floats/tests/hypot.rs

@@ -0,0 +1,3 @@
+use typed_floats::*;
+
+typed_floats_macros::generate_tests_self_rhs!(hypot);

typed_floats/tests/ln.rs

@@ -0,0 +1,3 @@
+use typed_floats::*;
+
+typed_floats_macros::generate_tests_self!(ln);

typed_floats/tests/ln_1p.rs

@@ -0,0 +1,3 @@
+use typed_floats::*;
+
+typed_floats_macros::generate_tests_self!(ln_1p);

typed_floats/tests/log10.rs

@@ -0,0 +1,3 @@
+use typed_floats::*;
+
+typed_floats_macros::generate_tests_self!(log10);

typed_floats/tests/log2.rs

@@ -0,0 +1,3 @@
+use typed_floats::*;
+
+typed_floats_macros::generate_tests_self!(log2);

typed_floats/tests/max.rs

@@ -0,0 +1,3 @@
+use typed_floats::*;
+
+typed_floats_macros::generate_tests_self_rhs!(max);

typed_floats/tests/min.rs

@@ -0,0 +1,3 @@
+use typed_floats::*;
+
+typed_floats_macros::generate_tests_self_rhs!(min);

typed_floats/tests/mul.rs

@@ -0,0 +1,3 @@
+use typed_floats::*;
+
+typed_floats_macros::generate_tests_self_rhs!(mul);

typed_floats/tests/neg.rs

@@ -0,0 +1,3 @@
+use typed_floats::*;
+
+typed_floats_macros::generate_tests_self!(neg);

typed_floats_tests/tests/others.rs → typed_floats/tests/others.rs

@@ -1,4 +1,3 @@
-#[cfg(test)]
 use typed_floats::*;
 
 #[test]

typed_floats/tests/recip.rs

@@ -0,0 +1,3 @@
+use typed_floats::*;
+
+typed_floats_macros::generate_tests_self!(recip);

typed_floats/tests/rem.rs

@@ -0,0 +1,3 @@
+use typed_floats::*;
+
+typed_floats_macros::generate_tests_self_rhs!(rem);

typed_floats/tests/round.rs

@@ -0,0 +1,3 @@
+use typed_floats::*;
+
+typed_floats_macros::generate_tests_self!(round);

typed_floats/tests/signum.rs

@@ -0,0 +1,3 @@
+use typed_floats::*;
+
+typed_floats_macros::generate_tests_self!(signum);

typed_floats/tests/sin.rs

@@ -0,0 +1,3 @@
+use typed_floats::*;
+
+typed_floats_macros::generate_tests_self!(sin);

typed_floats/tests/sinh.rs

@@ -0,0 +1,3 @@
+use typed_floats::*;
+
+typed_floats_macros::generate_tests_self!(sinh);

typed_floats/tests/sqrt.rs

@@ -0,0 +1,3 @@
+use typed_floats::*;
+
+typed_floats_macros::generate_tests_self!(sqrt);

typed_floats/tests/sub.rs

@@ -0,0 +1,3 @@
+use typed_floats::*;
+
+typed_floats_macros::generate_tests_self_rhs!(sub);

typed_floats/tests/tan.rs

@@ -0,0 +1,3 @@
+use typed_floats::*;
+
+typed_floats_macros::generate_tests_self!(tan);

typed_floats/tests/tanh.rs

@@ -0,0 +1,3 @@
+use typed_floats::*;
+
+typed_floats_macros::generate_tests_self!(tanh);

typed_floats/tests/to_degrees.rs

@@ -0,0 +1,3 @@
+use typed_floats::*;
+
+typed_floats_macros::generate_tests_self!(to_degrees);

typed_floats/tests/to_radians.rs

@@ -0,0 +1,3 @@
+use typed_floats::*;
+
+typed_floats_macros::generate_tests_self!(to_radians);

typed_floats/tests/trunc.rs

@@ -0,0 +1,3 @@
+use typed_floats::*;
+
+typed_floats_macros::generate_tests_self!(trunc);

typed_floats_macros/src/gen_tests.rs

@@ -103,16 +103,24 @@ fn get_test_values(float_type: Ident) -> proc_macro2::TokenStream {
     }
 }
 
-pub(crate) fn generate_tests_self(float_type: &'static str) -> proc_macro2::TokenStream {
+pub(crate) fn generate_tests_self(
+    float_type: &'static str,
+    filter: &str,
+) -> proc_macro2::TokenStream {
     let floats_f64 = get_definitions(float_type);
 
     let mut output = proc_macro2::TokenStream::new();
 
     let float_type = floats_f64[0].float_type_ident();
 
-    let test_fn_name = quote::format_ident!("test_{}", float_type);
+    let test_fn_name = quote::format_ident!("test_{float_type}_{filter}");
+
+    let ops = get_impl_self()
+        .into_iter()
+        .filter(|x| x.key == filter)
+        .collect::<Vec<_>>();
 
-    let ops = get_impl_self();
+    assert!(!ops.is_empty());
 
     for float in &floats_f64 {
         let mut init_test_ops = proc_macro2::TokenStream::new();
@@ -204,16 +212,24 @@ pub(crate) fn generate_tests_self(float_type: &'static str) -> proc_macro2::Toke
     }
 }
 
-pub(crate) fn generate_tests_self_rhs(float_type: &'static str) -> proc_macro2::TokenStream {
+pub(crate) fn generate_tests_self_rhs(
+    float_type: &'static str,
+    filter: &str,
+) -> proc_macro2::TokenStream {
     let floats_f64 = get_definitions(float_type);
 
     let mut output = proc_macro2::TokenStream::new();
 
     let float_type = floats_f64[0].float_type_ident();
 
-    let test_fn_name = quote::format_ident!("test_{}", float_type);
+    let test_fn_name = quote::format_ident!("test_{float_type}_{filter}");
+
+    let ops_rhs = get_impl_self_rhs()
+        .into_iter()
+        .filter(|x| x.key == filter)
+        .collect::<Vec<_>>();
 
-    let ops_rhs = get_impl_self_rhs();
+    assert!(!ops_rhs.is_empty());
 
     for float in &floats_f64 {
         let full_type = float.full_type_ident();

typed_floats_macros/src/lib.rs

@@ -25,26 +25,30 @@ static F32: &str = "f32";
 static F64: &str = "f64";
 
 #[proc_macro]
-pub fn generate_tests_self(_input: proc_macro::TokenStream) -> proc_macro::TokenStream {
+pub fn generate_tests_self(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
+    let filter = input.to_string();
+
     let mut output = proc_macro2::TokenStream::new();
 
-    output.extend(gen_tests::generate_tests_self(F32));
-    output.extend(gen_tests::generate_tests_self(F64));
+    output.extend(gen_tests::generate_tests_self(F32, &filter));
+    output.extend(gen_tests::generate_tests_self(F64, &filter));
 
     output.into()
 }
 
 #[proc_macro]
-pub fn generate_tests_self_rhs(_input: proc_macro::TokenStream) -> proc_macro::TokenStream {
+pub fn generate_tests_self_rhs(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
+    let filter = input.to_string();
+
     let mut output = proc_macro2::TokenStream::new();
 
-    output.extend(gen_tests::generate_tests_self_rhs(F32));
-    output.extend(gen_tests::generate_tests_self_rhs(F64));
+    output.extend(gen_tests::generate_tests_self_rhs(F32, &filter));
+    output.extend(gen_tests::generate_tests_self_rhs(F64, &filter));
 
     output.into()
 }
 
-fn get_specifications() -> Vec<(&'static str,&'static str, FloatSpecifications)> {
+fn get_specifications() -> Vec<(&'static str, &'static str, FloatSpecifications)> {
     vec![
         (
             "NonNaN",
@@ -211,7 +215,7 @@ pub fn generate_floats(_input: proc_macro::TokenStream) -> proc_macro::TokenStre
 }
 
 fn do_generate_generic_floats(
-    specifications: &[(&'static str,&'static str, FloatSpecifications)],
+    specifications: &[(&'static str, &'static str, FloatSpecifications)],
     default_float_type: &str,
 ) -> proc_macro2::TokenStream {
     let mut output = proc_macro2::TokenStream::new();