Satisfy clippy and make proptest optional for msrv

Author: akern40

.github/workflows/ci.yaml

@@ -12,7 +12,7 @@ name: Continuous integration
 env:
   CARGO_TERM_COLOR: always
   HOST: x86_64-unknown-linux-gnu
-  FEATURES: "approx,serde,rayon"
+  FEATURES: "approx,serde,rayon,proptest"
   RUSTFLAGS: "-D warnings"
   MSRV: 1.87.0
   BLAS_MSRV: 1.87.0
@@ -44,7 +44,7 @@ jobs:
           toolchain: ${{ matrix.rust }}
           components: clippy
       - uses: Swatinem/rust-cache@v2
-      - run: cargo clippy --features approx,serde,rayon
+      - run: cargo clippy "${FEATURES}"
 
   format:
     runs-on: ubuntu-latest

Cargo.toml

@@ -51,13 +51,14 @@ matrixmultiply = { version = "0.3.2", default-features = false, features=["cgemm
 serde = { version = "1.0", optional = true, default-features = false, features = ["alloc"] }
 rawpointer = { version = "0.2" }
 
+proptest = { workspace = true, optional = true }
+
 [dev-dependencies]
 defmac = "0.2"
 quickcheck = { workspace = true }
 approx = { workspace = true, default-features = true }
 itertools = { workspace = true }
 ndarray-gen = { workspace = true }
-proptest = { workspace = true }
 
 [features]
 default = ["std"]
@@ -75,6 +76,8 @@ matrixmultiply-threading = ["matrixmultiply/threading"]
 
 portable-atomic-critical-section = ["portable-atomic/critical-section"]
 
+proptest = ["dep:proptest"]
+
 
 [target.'cfg(not(target_has_atomic = "ptr"))'.dependencies]
 portable-atomic = { version = "1.6.0" }

scripts/all-tests.sh

@@ -8,6 +8,11 @@ CHANNEL=$2
 
 QC_FEAT=--features=ndarray-rand/quickcheck
 
+# Proptest needs 1.85, MSRV is 1.64, so only run proptest tests if MSRV is not set or if we're on a newer channel than MSRV
+if [[ -z "${MSRV}" ]] && [ "$CHANNEL" != "$MSRV" ]; then
+    FEATURES="$FEATURES,proptest"
+fi
+
 # build check with no features
 cargo build -v --no-default-features
 

src/impl_methods.rs

@@ -10,13 +10,13 @@ use alloc::slice;
 use alloc::vec;
 #[cfg(not(feature = "std"))]
 use alloc::vec::Vec;
-#[cfg(test)]
+#[cfg(all(test, feature = "proptest"))]
 use proptest::prop_assert_eq;
-#[cfg(test)]
+#[cfg(all(test, feature = "proptest"))]
 use proptest::proptest;
-#[cfg(test)]
+#[cfg(all(test, feature = "proptest"))]
 use proptest::strategy::Just;
-#[cfg(test)]
+#[cfg(all(test, feature = "proptest"))]
 use proptest::strategy::Strategy;
 #[allow(unused_imports)]
 use rawpointer::PointerExt;
@@ -3619,7 +3619,8 @@ mod tests
     }
 }
 
-#[cfg(test)]
+#[cfg(all(test, feature = "proptest"))]
+#[cfg_attr(miri, ignore)]
 proptest! {
     #[test]
     fn test_permute_axes_6d(p in Just([0, 1, 2, 3, 4, 5]).prop_shuffle()) {