From 0557feb5b97c60e105e8f234931847f7571ee6a1 Mon Sep 17 00:00:00 2001 From: Diggory Hardy Date: Mon, 16 Sep 2019 12:41:26 +0100 Subject: [PATCH] Fix arbitrary feature --- Cargo.toml | 8 ++++---- ci/build.sh | 3 ++- ci/test.sh | 2 +- nalgebra-lapack/Cargo.toml | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index f239c4d0..7d74b4f3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,11 +25,11 @@ std = [ "matrixmultiply", "alga/std", "alloc" ] # Since Cargo doesn't support multiplicitave features, use this to enable rand+std: rand_with_std = [ "rand/std", "std", "rand_distr" ] stdweb = [ "rand", "rand/stdweb" ] -arbitrary = [ "quickcheck" ] +arbitrary = [ "quickcheck", "rand" ] serde-serialize = [ "serde", "serde_derive", "num-complex/serde" ] abomonation-serialize = [ "abomonation" ] sparse = [ ] -debug = [ "approx/num-complex", "rand/std" ] +debug = [ "rand_with_std" ] alloc = [ ] io = [ "pest", "pest_derive" ] serde_derive = [] # dummy feature to avoid breakage @@ -42,13 +42,13 @@ rand_distr = { version = "0.2", optional = true } num-traits = { version = "0.2", default-features = false } num-complex = { version = "0.2", default-features = false } num-rational = { version = "0.2", default-features = false } -approx = { version = "0.3", default-features = false } +approx = { version = "0.3", default-features = false, features = ["num-complex"] } alga = { version = "0.9", default-features = false } matrixmultiply = { version = "0.2", optional = true } serde = { version = "1.0", optional = true, features = ["derive"] } abomonation = { version = "0.7", optional = true } mint = { version = "0.5", optional = true } -quickcheck = { version = "0.8", optional = true } +quickcheck = { version = "0.9", optional = true } pest = { version = "2.0", optional = true } pest_derive = { version = "2.0", optional = true } diff --git a/ci/build.sh b/ci/build.sh index b84100ad..7b36d27c 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -6,6 +6,7 @@ if [ -z "$NO_STD" ]; then if [ -z "$LAPACK" ]; then cargo build --verbose -p nalgebra --no-default-features --lib; cargo build --verbose -p nalgebra; + cargo build --verbose -p nalgebra --features "rand"; cargo build --verbose -p nalgebra --features "arbitrary"; cargo build --verbose -p nalgebra --features "mint"; cargo build --verbose -p nalgebra --features "alloc"; @@ -26,4 +27,4 @@ EOF rustup component add rust-src cargo install xargo xargo build --verbose --no-default-features --target=x86_64-unknown-linux-gnu --features "${CARGO_FEATURES}"; -fi \ No newline at end of file +fi diff --git a/ci/test.sh b/ci/test.sh index cf843be3..ea61202f 100755 --- a/ci/test.sh +++ b/ci/test.sh @@ -7,7 +7,7 @@ if [ -z "$NO_STD" ]; then cargo test --verbose --no-default-features --lib; cargo test --verbose --no-default-features --features "std" --tests; cargo test --verbose; - cargo test --verbose "arbitrary"; + cargo test --verbose --features "arbitrary"; cargo test --verbose --all-features; cd nalgebra-glm; cargo test --verbose; else diff --git a/nalgebra-lapack/Cargo.toml b/nalgebra-lapack/Cargo.toml index 1c2d2390..986e8a22 100644 --- a/nalgebra-lapack/Cargo.toml +++ b/nalgebra-lapack/Cargo.toml @@ -35,6 +35,6 @@ lapack-src = { version = "0.2", default-features = false } [dev-dependencies] nalgebra = { version = "0.18", path = "..", features = [ "arbitrary" ] } -quickcheck = "0.8" +quickcheck = "0.9" approx = "0.3" rand = "0.7"