Fix arbitrary feature

This commit is contained in:
Diggory Hardy 2019-09-16 12:41:26 +01:00
parent 5d514f99b6
commit 0557feb5b9
4 changed files with 8 additions and 7 deletions

View File

@ -25,11 +25,11 @@ std = [ "matrixmultiply", "alga/std", "alloc" ]
# Since Cargo doesn't support multiplicitave features, use this to enable rand+std: # Since Cargo doesn't support multiplicitave features, use this to enable rand+std:
rand_with_std = [ "rand/std", "std", "rand_distr" ] rand_with_std = [ "rand/std", "std", "rand_distr" ]
stdweb = [ "rand", "rand/stdweb" ] stdweb = [ "rand", "rand/stdweb" ]
arbitrary = [ "quickcheck" ] arbitrary = [ "quickcheck", "rand" ]
serde-serialize = [ "serde", "serde_derive", "num-complex/serde" ] serde-serialize = [ "serde", "serde_derive", "num-complex/serde" ]
abomonation-serialize = [ "abomonation" ] abomonation-serialize = [ "abomonation" ]
sparse = [ ] sparse = [ ]
debug = [ "approx/num-complex", "rand/std" ] debug = [ "rand_with_std" ]
alloc = [ ] alloc = [ ]
io = [ "pest", "pest_derive" ] io = [ "pest", "pest_derive" ]
serde_derive = [] # dummy feature to avoid breakage 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-traits = { version = "0.2", default-features = false }
num-complex = { version = "0.2", default-features = false } num-complex = { version = "0.2", default-features = false }
num-rational = { 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 } alga = { version = "0.9", default-features = false }
matrixmultiply = { version = "0.2", optional = true } matrixmultiply = { version = "0.2", optional = true }
serde = { version = "1.0", optional = true, features = ["derive"] } serde = { version = "1.0", optional = true, features = ["derive"] }
abomonation = { version = "0.7", optional = true } abomonation = { version = "0.7", optional = true }
mint = { version = "0.5", 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 = { version = "2.0", optional = true }
pest_derive = { version = "2.0", optional = true } pest_derive = { version = "2.0", optional = true }

View File

@ -6,6 +6,7 @@ if [ -z "$NO_STD" ]; then
if [ -z "$LAPACK" ]; then if [ -z "$LAPACK" ]; then
cargo build --verbose -p nalgebra --no-default-features --lib; cargo build --verbose -p nalgebra --no-default-features --lib;
cargo build --verbose -p nalgebra; 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 "arbitrary";
cargo build --verbose -p nalgebra --features "mint"; cargo build --verbose -p nalgebra --features "mint";
cargo build --verbose -p nalgebra --features "alloc"; cargo build --verbose -p nalgebra --features "alloc";
@ -26,4 +27,4 @@ EOF
rustup component add rust-src rustup component add rust-src
cargo install xargo cargo install xargo
xargo build --verbose --no-default-features --target=x86_64-unknown-linux-gnu --features "${CARGO_FEATURES}"; xargo build --verbose --no-default-features --target=x86_64-unknown-linux-gnu --features "${CARGO_FEATURES}";
fi fi

View File

@ -7,7 +7,7 @@ if [ -z "$NO_STD" ]; then
cargo test --verbose --no-default-features --lib; cargo test --verbose --no-default-features --lib;
cargo test --verbose --no-default-features --features "std" --tests; cargo test --verbose --no-default-features --features "std" --tests;
cargo test --verbose; cargo test --verbose;
cargo test --verbose "arbitrary"; cargo test --verbose --features "arbitrary";
cargo test --verbose --all-features; cargo test --verbose --all-features;
cd nalgebra-glm; cargo test --verbose; cd nalgebra-glm; cargo test --verbose;
else else

View File

@ -35,6 +35,6 @@ lapack-src = { version = "0.2", default-features = false }
[dev-dependencies] [dev-dependencies]
nalgebra = { version = "0.18", path = "..", features = [ "arbitrary" ] } nalgebra = { version = "0.18", path = "..", features = [ "arbitrary" ] }
quickcheck = "0.8" quickcheck = "0.9"
approx = "0.3" approx = "0.3"
rand = "0.7" rand = "0.7"